返回主界面 提示

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -24,14 +24,14 @@ namespace XHWK.WKTool
         private int ImgNum = 21;
         public void Initialize(bool ShowlblShortcut = false, int changeTime = 2100)
         {
-            if (ShowlblShortcut)
-            {
-                lblShortcut.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                lblShortcut.Visibility = Visibility.Hidden;
-            }
+            //if (ShowlblShortcut)
+            //{
+            //    lblShortcut.Visibility = Visibility.Visible;
+            //}
+            //else
+            //{
+            //    lblShortcut.Visibility = Visibility.Hidden;
+            //}
             ImgNum = 21;
             bool IsStart = true;
             new Thread(new ThreadStart(new Action(() =>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -341,9 +341,10 @@ namespace XHWK.WKTool
                 btnBlackPenOne.IsEnabled = true;//蓝笔可点击
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                btnReturn.IsEnabled = true;//返回主界面可点击
+            
                 txbTime.Visibility = Visibility.Visible;//时间显示
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                btnReturn.IsEnabled = false;//返回主界面可点击
                 try
                 {
                     new Thread(new ThreadStart(new Action(() =>
@@ -378,8 +379,8 @@ namespace XHWK.WKTool
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
                 btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-                btnReturn.IsEnabled = false;//返回主界面可点击
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+                btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -880,9 +881,14 @@ namespace XHWK.WKTool
         {
             if (!txbTime.Text.Equals("00:00"))
             {
-                MessageBoxResult dr = MessageWindow.Show("返回主界面视频不保存，是否返回？", "提示", MessageBoxButton.YesNo);
+                MessageBoxResult dr = MessageWindow.Show("返回主界面视频不保存，是否返回？", "提示", MessageBoxButton.OKCancel);
                 if (dr == MessageBoxResult.OK)
                 {
+                    IsSuspend = true;
+                    txbTime.Text = "00:00";
+
+                    txbTime.Visibility = Visibility.Hidden;
+                    End();
                     if (APP.W_XHMicroLessonSystemWindow == null)
                     {
                         APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();