Merge remote-tracking branch 'origin/zhangxueyang' into zyy

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -362,7 +362,7 @@ namespace XHWK.WKTool
                             BtnRecordingScreen.IsEnabled = false;
                             BtnStopRecordingScreen.IsEnabled = false;
                         });
-                        Thread.Sleep(4000);
+                        //Thread.Sleep(4000);
                         Dispatcher.Invoke(() =>
                         {
                             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
@@ -417,7 +417,7 @@ namespace XHWK.WKTool
                         BtnRecordingScreen.IsEnabled = false;
                         BtnStopRecordingScreen.IsEnabled = false;
                     });
-                    Thread.Sleep(2000);
+                    //Thread.Sleep(2000);
                     Dispatcher.Invoke(() =>
                     {
                         ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
@@ -1003,13 +1003,30 @@ namespace XHWK.WKTool
         /// </summary>
         public void ReturnPractice()
         {
-            Dispatcher.Invoke(() =>
+            new Thread(new ThreadStart(new Action(() =>
             {
-                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-            });
-            flg = 0;
-            APP.W_PracticeWindow.Hide();
+                Dispatcher.Invoke(() =>
+                {
+                    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                });
+                flg = 0;
+                Thread.Sleep(500);
+                Dispatcher.Invoke(() =>
+                {
+                    APP.W_PracticeWindow.Hide();
+                });
+            }))).Start();
+
+
+            //Dispatcher.Invoke(() =>
+            //{
+            //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+            //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            //});
+            //flg = 0;
+            //Thread.Sleep(300);
+            //APP.W_PracticeWindow.Hide();
         }
     }
 }