zhao：1修改批注不影响ppt和视频播放 2增加录屏录制按钮防止连击

XHWK.WKTool/PracticeWindow.xaml

@@ -10,10 +10,11 @@
     AllowsTransparency="True"
     Background="Transparent"
     Opacity="1"
+    Topmost="True"
     ShowInTaskbar="False"
     WindowStyle="None">
     <Grid>
         <Image x:Name="imgCanvas"/>
-        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2"/>
+        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="#021B1919" Visibility="Visible" Grid.ColumnSpan="2"/>
     </Grid>
 </Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -42,16 +42,17 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
         }
-        public void Initialize(string _imgPath)
+        public void Initialize(string _imgPath=null)
         {
             flg = 0;
             blackboard_canvas.Strokes.Clear();
             blackboard_canvas.UseCustomCursor = true;
             //blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
-            if (File.Exists(_imgPath))
-            {
-                imgCanvas.Source = new BitmapImage(new Uri(_imgPath));
-            }
+            //加背景 废弃更利于讲解ppt
+            //if (File.Exists(_imgPath))
+            //{
+            //    imgCanvas.Source = new BitmapImage(new Uri(_imgPath));
+            //}
 
 
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -247,12 +247,31 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
+        /// 是否已经按下按钮
+        /// </summary>
+        bool IsPressButton = false;
+        /// <summary>
         /// 开始或暂停录制
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void BtnRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+            }
+            #endregion
             if (IsSuspend)
             {
                 if (IsFirstRS)
@@ -443,6 +462,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStopRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+            }
+            #endregion
             k_hook.Stop();
             IsSuspend = true;
             txbTime.Text = "00:00";
@@ -551,9 +585,11 @@ namespace XHWK.WKTool
             {
                 Directory.CreateDirectory(tempPath);
             }
-            string imagePath = Path.Combine(tempPath, time + ".jpg");
 
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+            #region 录屏批注取消画笔
+            //string imagePath = Path.Combine(tempPath, time + ".jpg");
+            //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+            #endregion
 
             try
             {
@@ -600,7 +636,7 @@ namespace XHWK.WKTool
                         };
                         //practiceWin.Owner = this;
                     }
-                    APP.W_PracticeWindow.Initialize(imagePath);
+                    APP.W_PracticeWindow.Initialize();// imagePath);
                     flg = 11;
                     APP.W_PracticeWindow.Blue();
                     APP.W_PracticeWindow.Show();
@@ -833,9 +869,10 @@ namespace XHWK.WKTool
             {
                 Directory.CreateDirectory(tempPath);
             }
+            #region 录屏批注取消画笔
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+            #endregion
             try
             {
                 if (flg == 10)
@@ -877,7 +914,7 @@ namespace XHWK.WKTool
                         };
                         //practiceWin.Owner = this;
                     }
-                    APP.W_PracticeWindow.Initialize(imagePath);
+                    APP.W_PracticeWindow.Initialize();//imagePath);
                     flg = 10;
                     APP.W_PracticeWindow.Red();
                     APP.W_PracticeWindow.Show();
@@ -907,8 +944,11 @@ namespace XHWK.WKTool
                 {
                     Directory.CreateDirectory(tempPath);
                 }
-                string imagePath = Path.Combine(tempPath, time + ".jpg");
-                ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+                #region 录屏批注取消画笔
+                //string imagePath = Path.Combine(tempPath, time + ".jpg");
+                //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+                #endregion
 
                 try
                 {
@@ -924,7 +964,7 @@ namespace XHWK.WKTool
                         };
                         //practiceWin.Owner = this;
                     }
-                    APP.W_PracticeWindow.Initialize(imagePath);
+                    APP.W_PracticeWindow.Initialize();//imagePath);
 
                     if (flg == 0)
                     {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2685,7 +2685,7 @@ namespace XHWK.WKTool
 
         }
         #endregion
-
+        bool IsPressButton = false;
         /// <summary>
         /// 录制窗口内容
         /// </summary>
@@ -2693,6 +2693,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+            }
+            #endregion
             Record();
             if (!APP.CheckScreenCapturerRecorder())
             {
@@ -2723,6 +2738,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStop_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+            }
+            #endregion
             blackboard_canvas.Visibility = Visibility.Collapsed;
             EndRecord();
         }