zhao:1解决录制不全的问题，2解决录制时间不准画面和声音有偏差的问题

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -257,7 +257,7 @@
                     </StackPanel>
                 </Button>
             </StackPanel>
-        </Grid>
+            </Grid>
 
         <!--主内容-->
         <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2191,9 +2191,9 @@ namespace XHWK.WKTool
                     #endregion
                     IsFirstR = false;
                     RsImgName = new List<string>();
-                    ///启动截图
-                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 200);
                     SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                    ///启动截图
+                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 20);
                     //{
                     //    AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
                     //};//设置执行一次（false）还是一直执行(true)
@@ -2233,6 +2233,7 @@ namespace XHWK.WKTool
                         Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
+                            Recorddt = DateTime.Now;
                             IsStartCount = true;
                             //Stack();
                             //timer.Start();
@@ -2288,38 +2289,70 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 录制保存图片
+        /// 记录上次截图时间
+        /// </summary>
+        DateTime Recorddt = DateTime.Now;
+        /// <summary>
+        /// 录制保存图片计时器
         /// </summary>
         /// <param name="sender"></param>
         private void Timer_Elapsed(object sender)
         {
             if (IsStartCount)
             {
-                try
+                DateTime dt = DateTime.Now;
+                TimeSpan ts = dt.Subtract(Recorddt);//时间差   
+                double tsmi = ts.TotalMilliseconds;
+                if (tsmi > 200.0)
                 {
-                    Dispatcher.Invoke(() =>
+                    Recorddt = Recorddt.AddMilliseconds(200);
+                    Thread thread = new Thread(RecordSaveImage);
+                    //开启线程
+                    thread.Start();
+                }
+            }
+        }
+        /// <summary>
+        /// 录制保存图片
+        /// </summary>
+        void RecordSaveImage()
+        {
+            try
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    if (IsStartCount)
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
                         RsImgName.Add(FilePathName);
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)ActualWidth, (int)ActualHeight);
-                        SRTime=SRTime.AddMilliseconds(200);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)));
+                        SRTime = SRTime.AddMilliseconds(200);
+                        if (txbTime.Visibility == Visibility.Hidden)
+                        {
+                            txbTime.Visibility = Visibility.Visible;
+                        }
                         if (SRTime.Hour > 0)
                         {
+                            //Dispatcher.Invoke(() =>
+                            //{
                             txbTime.Text = SRTime.ToString("HH:mm:ss");
+                            //});
                         }
                         else
                         {
+                            //Dispatcher.Invoke(() =>
+                            //{
                             txbTime.Text = SRTime.ToString("mm:ss");
+                            //});
                         }
-                    });
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
-                }
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
             }
         }
-
         /// <summary>
         /// 停止录制并生成录制文件
         /// </summary>
@@ -2412,6 +2445,7 @@ namespace XHWK.WKTool
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
                     new Thread(new ThreadStart(new Action(() =>
                     {
+                        IsStartCount = false;
                         //停止截图
                         while (APP.FFmpeg.myProcess != null)
                         {
@@ -2419,7 +2453,6 @@ namespace XHWK.WKTool
                         }
                         Dispatcher.Invoke(() =>
                         {
-                            IsStartCount = false;
                             timer.Change(-1, 0);
                             timer.Dispose();
                                     //End();
@@ -4059,5 +4092,11 @@ namespace XHWK.WKTool
         {
             Thread.Sleep(2000);
         }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            
+            MessageWindow.Show("A："+ActualWidth*(PrimaryScreen.DpiX / 96f)+"x" +ActualHeight * (PrimaryScreen.DpiY / 96f) + "  wh："+Width+"x"+Height);
+        }
     }
 }