zhao：1解决缩放百分比后无法录制全屏的问题。 2优化录制效率，限制录制视频大小，异步保存。

Common/system/FFMpeg.cs

@@ -108,7 +108,8 @@ namespace Common.system
             switch (Extension.ToUpper())
             {
                 case ".MP4":
-                    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;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -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))
                     //{
                     //    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 " + PathName;  //ffmpeg的参数
@@ -121,7 +122,7 @@ namespace Common.system
                     break;
                 case ".AVI":
                 case ".FLV":
-                    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 -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -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的参数
@@ -133,7 +134,7 @@ namespace Common.system
                     //}
                     break;
                 default:
-                    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;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
             }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动

Common/system/ImageHelper.cs

@@ -6,9 +6,12 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
+using VisioForge.Shared.Helpers;
+
 namespace Common.system
 {
     /// <summary>
@@ -447,25 +450,23 @@ namespace Common.system
                 }
                 else
                 {
+                    //SaveImageModel sim = new SaveImageModel();
+                    //sim.encoder = new PngBitmapEncoder();
+                    //sim.encoder = new PngBitmapEncoder();
+                    //BitmapFrame test= encoder.Frames[0];
+                    //sim.encoder.Frames.Add(BitmapFrame.Create(test));
+                    ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
+                    ////sim.encoder.CopyTo(encoder);
+                    ////encoder.CopyTo(sim.encoder);
+                    //sim.FilePath = filePathName;
+                    ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                    ////bmp.CopyTo(sim.bmp);
+                    //Thread t1 = new Thread(SaveImage);
+                    //t1.Start(sim);
+
                     System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
                     encoder.Save(fs);
                     fs.Close();
-
-                    //MemoryStream memoryStream = new MemoryStream();
-                    //encoder.Save(memoryStream);
-                    //Bitmap bit = new Bitmap(memoryStream);
-                    //bit.Save(filePathName);
-                    //bit.Dispose();
-
-                    //using (FileStream tFileStream = new FileStream(filePathName,FileMode.Create, FileAccess.Write))
-                    //{
-                    //    PngBitmapEncoder tPngBitmapEncoder = new PngBitmapEncoder();
-                    //    tPngBitmapEncoder.Interlace = PngInterlaceOption.On;
-                    //    tPngBitmapEncoder.Frames.Add(BitmapFrame.Create(bmp));
-                    //    tPngBitmapEncoder.Save(tFileStream);
-                    //    tFileStream.Close();
-                    //}
-
                 }
             }
             catch (Exception ex)
@@ -474,6 +475,20 @@ namespace Common.system
                 //Console.WriteLine(ex.Message);
             }
         }
+
+        private static void SaveImage(object obj)
+        {
+            SaveImageModel sim = (SaveImageModel)obj;
+            //RenderTargetBitmap bmp = sim.bmp;
+            //BitmapEncoder encoder = new PngBitmapEncoder();
+            //encoder.Frames.Add(BitmapFrame.Create(bmp));
+            BitmapEncoder encoder = sim.encoder;
+            string filePathName = sim.FilePath;
+            System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+            encoder.Save(fs);
+            fs.Close();
+        }
+
         #endregion
 
         #region 去掉白边
@@ -600,4 +615,11 @@ namespace Common.system
         }
         #endregion
     }
+    public class SaveImageModel
+    {
+        public string FilePath { get; set; }
+        public BitmapEncoder encoder { get; set; }
+        //public RenderTargetBitmap bmp { get; set; }
+    }
+
 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -391,17 +391,14 @@ namespace XHWK.WKTool
                     #endregion
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        if (IsFirstRS)
-                        {
-                            Thread.Sleep(1500);
-                        }
+                        Thread.Sleep(800);
                         if(APP.FFmpeg.myProcess!=null)
                         {
                             Thread.Sleep(100);
                         }
                         APP.FFmpeg.StartRecordingVideo(VideoSavePathName);
 
-                        Thread.Sleep(1000);
+                        Thread.Sleep(1300);
                         Dispatcher.Invoke(() =>
                         {
                             Stack();

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3114,7 +3114,7 @@ namespace XHWK.WKTool
                         //}
                         #endregion         
                         //保存图片
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, 0, 0);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, gridActWidth, gridActHeight);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f)), 0, 0);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), (int)RsW, (int)RsH);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), 1281, 1026);