修改说明

sangyuxiaowu · Sep 29, 2022 · a068b5d · a068b5d
1 parent 1f4751d
commit a068b5d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ A simple desktop screenshot OCR tool for Windows platform, use the system's own
 - Clipboard image recognition
 - Drag and drop
 
+<hr>
 
 - 离线使用
 - 中英文字符识别

diff --git a/Snipping_OCR/Main.Designer.cs b/Snipping_OCR/Main.Designer.cs
diff --git a/Snipping_OCR/Main.cs b/Snipping_OCR/Main.cs
@@ -34,7 +34,7 @@ private void Main_Load(object sender, EventArgs e)
             //注册热键 Ctrl+ALT+A 截图
             try
             {
-                Hotkey.Regist(base.Handle, HotkeyModifiers.MOD_CONTROL_ALT, Keys.A, new Hotkey.HotKeyCallBackHanlder(StartCaptureAsync));
+                Hotkey.Regist(base.Handle, HotkeyModifiers.MOD_CONTROL_ALT, Keys.A, new Hotkey.HotKeyCallBackHanlder(StartCapture));
             }
             catch
             {
@@ -52,7 +52,7 @@ private void Main_FormClosed(object sender, FormClosedEventArgs e)
         {
             try
             {
-                Hotkey.UnRegist(base.Handle, new Hotkey.HotKeyCallBackHanlder(StartCaptureAsync));
+                Hotkey.UnRegist(base.Handle, new Hotkey.HotKeyCallBackHanlder(StartCapture));
             }
             catch
             {
@@ -65,7 +65,7 @@ private void Main_FormClosed(object sender, FormClosedEventArgs e)
         /// <summary>
         /// 调用系统截图处理
         /// </summary>
-        private void StartCaptureAsync()
+        private void StartCapture()
         {
             // 隐藏
             this.WindowState = FormWindowState.Minimized;
@@ -107,6 +107,8 @@ private void SnippingToolProcess_Exited(object? sender, EventArgs e)
             }));
         }
 
+        private readonly string[] ImgAllow = new string[] { "jpg", "png", "gif", "peg", "bmp" };
+
         /// <summary>
         /// 从剪切板获取图片并识别
         /// </summary>
@@ -122,11 +124,16 @@ private void ClipboardOCR()
                 return;
             }
 
+            // 直接复制的图片文件
             var files = Clipboard.GetFileDropList();
             if (files.Count > 0)
             {
-                sqPhoto.Image = Image.FromFile(files[0]!);
-                timeOCR_Start();
+                string ext = files[0].ToLower().Substring(files[0].Length - 3);
+                if (ImgAllow.Contains(ext))
+                {
+                    sqPhoto.Image = Image.FromFile(files[0]);
+                    timeOCR_Start();
+                }
             }
         }
 
@@ -137,10 +144,9 @@ private void ClipboardOCR()
         /// <param name="e"></param>
         private void sqPhoto_DragDrop(object sender, DragEventArgs e)
         {
-            string[] allow = new string[] { "jpg", "png", "gif", "peg", "bmp" };
-            string file = ((System.Array)e.Data.GetData(DataFormats.FileDrop)).GetValue(0).ToString();
+            string file = ((System.Array)e.Data.GetData(DataFormats.FileDrop)).GetValue(0).ToString()!;
             string ext = file.ToLower().Substring(file.Length - 3);
-            if (allow.Contains(ext))
+            if (ImgAllow.Contains(ext))
             {
                 sqPhoto.Image = Image.FromFile(file);
                 timeOCR_Start();
@@ -229,6 +235,9 @@ private void Main_SizeChanged(object sender, EventArgs e)
             WindowsAPI.ShowWindow(this.Handle, 9);
         }
 
-
+        private void 开始截图ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            StartCapture();
+        }
     }
 }