zhao：1笔增加防连击 2解决画笔关掉再打开闪一下

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
@@ -388,10 +389,30 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            blackboard_canvas.Strokes.Clear();
-            APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
+            ReturnPractice();
             //Hide();
         }
+        /// <summary>
+        /// 退出批注并清空画板
+        /// </summary>
+        public void ReturnPractice()
+        {
+            blackboard_canvas.Strokes.Clear();
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    APP.W_ScreenRecordingToolbarWindow.ModifyState();
+                });
+                flg = 0;
+                Thread.Sleep(500);
+                Dispatcher.Invoke(() =>
+                {
+                    this.Owner = null;
+                    APP.W_PracticeWindow.Hide();
+                });
+            }))).Start();
+        }
     }
 }
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -581,6 +581,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrush_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+            }
+            #endregion
             string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             if (!Directory.Exists(tempPath))
@@ -604,7 +619,7 @@ namespace XHWK.WKTool
                     });
                     flg = 1;
                     this.Owner = null;
-                    APP.W_PracticeWindow.Hide();
+                    APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 10)
                 {
@@ -868,6 +883,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBlackPenTwo_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+            }
+            #endregion
             string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             if (!Directory.Exists(tempPath))
@@ -889,7 +919,7 @@ namespace XHWK.WKTool
                     });
                     flg = 0;
                     this.Owner = null;
-                    APP.W_PracticeWindow.Hide();
+                    APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 11)
                 {
@@ -934,7 +964,7 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 鼠标右键按下事件
+        /// 鼠标右键按下事件 废弃
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1058,7 +1088,7 @@ namespace XHWK.WKTool
             Hide();
         }
         /// <summary>
-        /// 批注退出
+        /// 批注退出 废弃
         /// </summary>
         public void ReturnPractice()
         {
@@ -1088,5 +1118,13 @@ namespace XHWK.WKTool
             //Thread.Sleep(300);
             //APP.W_PracticeWindow.Hide();
         }
+        /// <summary>
+        /// 修改笔状态
+        /// </summary>
+        public void ModifyState()
+        {
+            borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+        }
     }
 }