Browse Source

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

tags/录制修改前
耀 4 years ago
parent
commit
12e349ab8d
1 changed files with 25 additions and 8 deletions
  1. 25
    8
      XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

+ 25
- 8
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

362
                             BtnRecordingScreen.IsEnabled = false;
362
                             BtnRecordingScreen.IsEnabled = false;
363
                             BtnStopRecordingScreen.IsEnabled = false;
363
                             BtnStopRecordingScreen.IsEnabled = false;
364
                         });
364
                         });
365
-                        Thread.Sleep(4000);
365
+                        //Thread.Sleep(4000);
366
                         Dispatcher.Invoke(() =>
366
                         Dispatcher.Invoke(() =>
367
                         {
367
                         {
368
                             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
368
                             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
417
                         BtnRecordingScreen.IsEnabled = false;
417
                         BtnRecordingScreen.IsEnabled = false;
418
                         BtnStopRecordingScreen.IsEnabled = false;
418
                         BtnStopRecordingScreen.IsEnabled = false;
419
                     });
419
                     });
420
-                    Thread.Sleep(2000);
420
+                    //Thread.Sleep(2000);
421
                     Dispatcher.Invoke(() =>
421
                     Dispatcher.Invoke(() =>
422
                     {
422
                     {
423
                         ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
423
                         ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
1003
         /// </summary>
1003
         /// </summary>
1004
         public void ReturnPractice()
1004
         public void ReturnPractice()
1005
         {
1005
         {
1006
-            Dispatcher.Invoke(() =>
1006
+            new Thread(new ThreadStart(new Action(() =>
1007
             {
1007
             {
1008
-                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
1009
-                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
1010
-            });
1011
-            flg = 0;
1012
-            APP.W_PracticeWindow.Hide();
1008
+                Dispatcher.Invoke(() =>
1009
+                {
1010
+                    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
1011
+                    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
1012
+                });
1013
+                flg = 0;
1014
+                Thread.Sleep(500);
1015
+                Dispatcher.Invoke(() =>
1016
+                {
1017
+                    APP.W_PracticeWindow.Hide();
1018
+                });
1019
+            }))).Start();
1020
+
1021
+
1022
+            //Dispatcher.Invoke(() =>
1023
+            //{
1024
+            //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
1025
+            //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
1026
+            //});
1027
+            //flg = 0;
1028
+            //Thread.Sleep(300);
1029
+            //APP.W_PracticeWindow.Hide();
1013
         }
1030
         }
1014
     }
1031
     }
1015
 }
1032
 }

Loading…
Cancel
Save