zhao:1多屏幕录制改为录制主屏幕。2优化消息提示

Common/system/FFMpeg.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -45,7 +46,7 @@ namespace Common.system
         /// 录制屏幕
         /// </summary>
         /// <param name="FilePath">文件存储路径</param>
-        public bool StartRecordingVideo(string FilePath, out string ErrMessage)
+        public bool StartRecordingVideo(string FilePath, Size size, out string ErrMessage)
         {
             while (myProcess != null)
             {
@@ -117,7 +118,7 @@ namespace Common.system
             switch (Extension.ToUpper())
             {
                 case ".MP4":
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     //myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     //if (string.IsNullOrWhiteSpace(MicrophoneName))
                     //{
@@ -131,7 +132,7 @@ namespace Common.system
                     break;
                 case ".AVI":
                 case ".FLV":
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
                     //if (string.IsNullOrWhiteSpace(MicrophoneName))
                     //{
                     //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
@@ -143,7 +144,7 @@ namespace Common.system
                     //}
                     break;
                 default:
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
             }
             if (OutputVideoLog)

Common/system/ImageHelper.cs

@@ -419,7 +419,7 @@ namespace Common.system
                         encoder.Save(memoryStream);
                         new Thread(new ThreadStart(new Action(() =>
                         {
-                        //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
+                            //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
                             Bitmap bit = new Bitmap(memoryStream);
                             if (ImgWidth - 2 < bit.Width)
                             {

Common/system/MouseEventCommon.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 namespace Common.system
 {
@@ -22,7 +17,7 @@ namespace Common.system
         /// <returns></returns>
         [DllImport("user32.dll")]
         public static extern int SetCursorPos(int x, int y);
-        
+
         /// <summary>   
         /// 获取鼠标的坐标   
         /// </summary>   

XHWK.WKTool/App.cs

@@ -544,7 +544,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    MessageBoxResult br = MessageWindow.Show("不安装环境将无法使用微课录制系统，是否重新安装？", "安装", MessageBoxButton.OKCancel);
+                    MessageBoxResult br = MessageWindow.Show("不安装环境将无法使用微课录制系统，是否现在安装？", "安装", MessageBoxButton.OKCancel);
                     if (br == MessageBoxResult.OK)
                     {
                         return InstallScreenCapturerRecorder();

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Common.system;
+
 using System;
 using System.Collections.Generic;
 using System.Threading;

XHWK.WKTool/PrintWindow.xaml.cs

@@ -84,7 +84,7 @@ namespace XHWK.WKTool
             if (string.IsNullOrWhiteSpace(cmbClass.Text))
             {
                 //MessageWindow.Show("打印机不能为空！");
-                MessageWindow.Show("打印机不能为空！");
+                MessageWindow.Show("请设置打印机！");
                 return;
             }
             //APP.myloading.Show();
@@ -420,8 +420,8 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             tip_outer.Visibility = Visibility.Collapsed;
-                                //tip_outer.Visibility = Visibility.Collapsed;
-                                MessageWindow.Show("打印成功");
+                            //tip_outer.Visibility = Visibility.Collapsed;
+                            MessageWindow.Show("打印成功");
                         });
                     }))).Start();
                 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
@@ -426,7 +425,8 @@ namespace XHWK.WKTool
                         {
                             Thread.Sleep(100);
                         }
-                        bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, out string ErrMessage);
+                        System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
+                        bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, DesktopSize, out string ErrMessage);
 
                         Thread.Sleep(1300);
                         Dispatcher.Invoke(() =>
@@ -599,7 +599,7 @@ namespace XHWK.WKTool
                         //视频过短
                         APP.FFmpeg.SuspendFFmpeg();
                         IsFirstRS = true;
-                        MessageWindow.Show("保存失败，录屏时间过短！");
+                        MessageWindow.Show("录屏时间过短，请重新录制！");
                     }
                 }
                 catch (Exception ex)
@@ -1100,7 +1100,7 @@ namespace XHWK.WKTool
         {
             if (!IsFirstRS)
             {
-                MessageBoxResult br = MessageWindow.Show("退出将不保存当前录屏！", "提示", MessageBoxButton.OKCancel);
+                MessageBoxResult br = MessageWindow.Show("退出将取消保存当前录屏，是否继续？", "提示", MessageBoxButton.OKCancel);
                 if (br == MessageBoxResult.Cancel)
                 {
                     return;

XHWK.WKTool/UploadWindow.xaml.cs

@@ -198,7 +198,7 @@ namespace XHWK.WKTool
         {
             if (string.IsNullOrWhiteSpace(book_list.Text))
             {
-                MessageWindow.Show("教材不能为空！");
+                MessageWindow.Show("请选择教材！");
             }
             btnStart.IsEnabled = false;
             book_list.IsEnabled = false;
@@ -331,7 +331,7 @@ namespace XHWK.WKTool
                     cmbTeachingMaterial.IsEnabled = true;
                     times.Stop();
                     tip_outer.Visibility = Visibility.Collapsed;
-                    MessageWindow.Show("视频上传失败！");
+                    MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
                     APP.IsUpLoad = false;
                     Hide();
                     LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -184,7 +184,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
-            if(APP.isDebug)
+            if (APP.isDebug)
             {
                 txbVersion.Text = "测试版：";
             }
@@ -192,7 +192,7 @@ namespace XHWK.WKTool
             {
                 txbVersion.Text = "正式版：";
             }
-           
+
             #region 数据初始化
             string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
             FileToolsCommon.CreateDirectory(pathTemp);
@@ -677,7 +677,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    MessageWindow.Show("接口地址未输入");
+                    MessageWindow.Show("请输入接口地址");
                     return;
                 }
                 if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
@@ -688,7 +688,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    MessageWindow.Show("上传地址未输入");
+                    MessageWindow.Show("请输入上传地址");
                     return;
                 }
                 if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
@@ -699,7 +699,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    MessageWindow.Show("下载地址未输入");
+                    MessageWindow.Show("请输入下载地址");
                     return;
                 }
                 if (!APP.apiUrl.Equals("http://" + txbInterfaceAddress.Text))
@@ -782,7 +782,7 @@ namespace XHWK.WKTool
                 {
                     //存储文件
                     FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
-                    MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
+                    MessageWindow.Show("路径已变更，下次创建微课时自动生效。");
                 }
             }
             catch (Exception ex)
@@ -1290,7 +1290,7 @@ namespace XHWK.WKTool
                         {
                             Dispatcher.Invoke(new Action(() =>
                             {
-                                MessageWindow.Show("文件无效或处于打开状态！");
+                                MessageWindow.Show("无法访问文件，请检查文件是否有效或解除文件占用！");
                             }));
 
                             LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
@@ -1487,7 +1487,7 @@ namespace XHWK.WKTool
                         {
                             Dispatcher.Invoke(new Action(() =>
                             {
-                                MessageWindow.Show("文件无效或处于打开状态！");
+                                MessageWindow.Show("无法访问文件，请检查文件是否有效或解除文件占用！");
                             }));
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
@@ -1631,7 +1631,7 @@ namespace XHWK.WKTool
                                   catch (Exception ex)
                                   {
                                       APP.myloading.Hide();
-                                      MessageWindow.Show("文件无效或者文件被加密！");
+                                      MessageWindow.Show("无法访问文件，请检查文件是否有效或解除文件占用！");
                                       LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                                   }
                               }
@@ -3455,14 +3455,14 @@ namespace XHWK.WKTool
                         timer.Dispose();
                         IsFirstR = true;
 
-                      
 
-                      
+
+
                         BtnRecord.IsEnabled = true;
                         btnStop.IsEnabled = true;
                         TxbRecordingWord.Text = "录制";
                         txbType.Text = "";
-                        MessageWindow.Show("保存失败，录制时间过短");
+                        MessageWindow.Show("录制时间过短，请重新录制！");
                         Dispatcher.Invoke(() =>
                         {
                             txbTime.Text = "";