测试 1.2.3(Build 24)

版本更新公告： 1.新增快捷键EXC退出截图。 2.鼠标右键删除截图图片，修改为Delete键删除。

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="23" />
-    <add key="VersionName" value="1.2.2" />
+    <add key="VersionCode" value="24" />
+    <add key="VersionName" value="1.2.3" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -50,7 +50,10 @@ namespace ComeCapture
 
         private double _X0 = 0;
         private double _Y0 = 0;
-
+        /// <summary>
+        /// 键盘钩子
+        /// </summary>
+        private KeyboardHookCommon k_hook;
         //private IntPtr BitmapPtr = IntPtr.Zero;
         //private IntPtr JieTuBitmapPtr = IntPtr.Zero;
         /// <summary>
@@ -60,6 +63,8 @@ namespace ComeCapture
         {
             _Current = this;
             InitializeComponent();
+            k_hook = new KeyboardHookCommon();
+            k_hook.KeyDownEvent += K_hook_KeyDownEvent;
             DataContext = new AppModel();
             initialization();
             Screenshot();
@@ -102,6 +107,29 @@ namespace ComeCapture
             DataContext = new AppModel();
             WpfHelper.MainDispatcher = Dispatcher;
         }
+        /// <summary>
+        /// 初始化快捷键
+        /// </summary>
+        public void InitializeKeyDownEvent()
+        {
+          
+            k_hook.Start();//安装键盘钩子
+        }
+        /// <summary>
+        /// 快捷键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
+        {
+            if (e.KeyValue == (int)System.Windows.Forms.Keys.Escape)
+            {
+                k_hook.Stop();
+                Current.OnCancel();
+                APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
+                this.Hide();
+            }
+        }
 
         #region 属性 Current
 
@@ -295,6 +323,7 @@ namespace ComeCapture
             //this.Hide();
             if (ChangeTextEvent != null)
             {
+                k_hook.Stop();
                 ChangeTextEvent("关闭窗口");
             }
         }

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -107,6 +107,8 @@ namespace XHWK.WKTool
             gridThickness.Visibility = Visibility.Hidden;
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+            btnReturn.IsEnabled = true;//返回主界面可点击
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
             imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
             btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
@@ -349,7 +351,7 @@ namespace XHWK.WKTool
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
                 //borOne.Background = new SolidColorBrush(Colors.LightBlue);
-                //btnReturn.IsEnabled = false;//返回主界面可点击
+                btnReturn.IsEnabled = false;//返回主界面可点击
 
                 try
                 {
@@ -407,7 +409,7 @@ namespace XHWK.WKTool
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                //btnReturn.IsEnabled = true;//返回主界面可点击
+                btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -466,6 +468,7 @@ namespace XHWK.WKTool
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
             }
+            APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             APP.W_XHMicroLessonSystemWindow.Show();
             if (!IsFirstRS)
             {
@@ -995,6 +998,7 @@ namespace XHWK.WKTool
                     LogHelper.WriteErrLog("【录屏返回】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
                 }
             }
+            APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             APP.W_XHMicroLessonSystemWindow.Show();
             Hide();
         }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -319,7 +319,7 @@
                                         </ScrollViewer>-->
                                     <!--图片表框 -->
                                     <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
-                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
                                     <!--四个点 -->
                                     <Canvas>
                                         <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -176,6 +176,8 @@ namespace XHWK.WKTool
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             InitPen();
+            k_hook = new KeyboardHookCommon();
+            k_hook.KeyDownEvent += K_hook_KeyDownEvent;
         }
         /// <summary>
         /// 初始化
@@ -207,7 +209,13 @@ namespace XHWK.WKTool
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
             ImgPDFPath = new string[300];
-
+        } 
+        /// <summary>
+        /// 初始化快捷键
+        /// </summary>
+        public void InitializeKeyDownEvent() 
+        {
+            k_hook.Start();//安装键盘钩子
         }
         /// <summary>
         /// 快捷键
@@ -232,14 +240,16 @@ namespace XHWK.WKTool
                     next_btn_Click(null, null);
                 }
             }
-            //if (e.KeyValue == (int)System.Windows.Forms.Keys.Delete)
-            //{
-            //    if (APP.pageData.currpage < APP.pageData.pagenum)
-            //    {
-            //        //下一页
-            //        next_btn_Click(null, null);
-            //    }
-            //}
+            if (e.KeyValue == (int)System.Windows.Forms.Keys.Delete)
+            {
+                if (RectImgBorder.Visibility != Visibility.Hidden)
+                {
+                    HideAngleBorder();
+                    imgCanvas.Source = null;
+                    APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = null;
+                    APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath = null;
+                }
+            }
         }
 
         /// <summary>
@@ -902,20 +912,24 @@ namespace XHWK.WKTool
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + time + ".jpg";
             APP.ImgPath = desktopPath;
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), desktopPath, false, out BitmapImage bitmap);
+            k_hook.Stop();
             if (WindowState == WindowState.Normal)//截图隐藏窗口
             {
                 WindowState = WindowState.Minimized;
             }
+       
             if (APP.W_JieTuWindow != null)
             {
                 APP.W_JieTuWindow.initialization();
                 APP.W_JieTuWindow.Screenshot();
+                APP.W_JieTuWindow.InitializeKeyDownEvent();
                 APP.W_JieTuWindow.WindowState = WindowState.Maximized;
                 APP.W_JieTuWindow.Visibility = Visibility.Visible;
             }
             else
             {
                 APP.W_JieTuWindow = new JieTuWindow();
+                APP.W_JieTuWindow.InitializeKeyDownEvent();
                 // 订阅事件
                 APP.W_JieTuWindow.ChangeTextEvent += new ChangeTextHandler(frm_ChangeTextEvent);
                 APP.W_JieTuWindow.click_closeJietuWindowClick += JietuWindow_click_closeJietuWindowClick;
@@ -937,6 +951,7 @@ namespace XHWK.WKTool
                     Topmost = true;
                     WindowState = WindowState.Normal;
                 }
+                InitializeKeyDownEvent();
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
                     if (APP.pageData.currpage == 0)
@@ -2629,7 +2644,8 @@ namespace XHWK.WKTool
             //        return;
             //    }
             //}
-            #endregion   
+            #endregion
+            k_hook.Stop();
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
                 APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow