打包时移除JRE运行环境；优化快捷键 ESC 判断逻辑

Author: AnyListen

pom.xml

@@ -80,6 +80,9 @@
                     <verbose>true</verbose>
                     <vendor>com.luooqi</vendor>
                     <needShortcut>true</needShortcut>
+                    <bundleArguments>
+                        <runtime />
+                    </bundleArguments>
                 </configuration>
             </plugin>
         </plugins>

readme.md

@@ -8,22 +8,28 @@
 
 > 文字识别使用了各云平台开发的识别接口，因此需要联网才能正常使用。
 
-### 程序使用
-#### 启动截图
+## 程序使用
+### 启动截图
 - 方法一：在程序主界面点击截图按钮；
 - 方法二：点击截图快捷键 F4。
 
-#### 圈选区域
+### 圈选区域
 进入截图界面后，按下鼠标左键，然后拖动即可圈选所要截取的区域；
 圈选结束后，可以对圈选的区域进行微调：
 - 使用 **方向键**，可以对所选区域的右边界和上边界进行微调；
 - 使用 **Shift+方向键**，可以对所选区域的左边界和下边界进行微调；
 - 使用 **Ctrl+A**，可以全选整个屏幕。
 
-#### 确定圈选
+### 确定圈选
 圈选完成后，点击 `Enter` 或者 `Space` 键，即可确认圈选；确认圈选后，会自动对所选区域进行 OCR 文字识别。
 
-### TODO
+## 注意事项
+### MAC权限设置
+由于监控了截图快捷键，因此MAC需要开启相应的权限，请见下图：
+
+![MAC权限设置](http://img.luooqi.com/Fo31NZQIhPNF6m7gOorRGDuKvaZ_)
+
+## TODO
 - [x] 完成图片文字识别
   - [x] 识别结果文本对齐（暂未实现多分栏）
   - [x] 全屏模式下截图的实现

src/main/java/com/luooqi/ocr/snap/ScreenCapture.java

@@ -42,6 +42,7 @@ public class ScreenCapture{
 	private GraphicsContext gc;
 	private Scene scene;
 	private Stage stage;
+	public static boolean isSnaping = false;
 
 	/**
 	 * When a key is being pressed into the capture window then this Animation Timer is doing it's magic.
@@ -286,9 +287,11 @@ private void addKeyHandlers() {
 
 			if (key.getCode() == KeyCode.ESCAPE || key.getCode() == KeyCode.BACK_SPACE) {
 				cancelSnap();
+				isSnaping = false;
 			} else if (key.getCode() == KeyCode.ENTER || key.getCode() == KeyCode.SPACE) {
 				deActivateAllKeys();
 				prepareImage();
+				isSnaping = false;
 			}
 		});
 
@@ -376,6 +379,7 @@ private void selectWholeScreen() {
 	}
 
 	public void prepareForCapture() {
+		isSnaping = true;
 		MainFm.stage.close();
 		Platform.runLater(()->{
 			try {

src/main/java/com/luooqi/ocr/utils/CommUtils.java

@@ -52,8 +52,8 @@ public static byte[] imageToBytes(BufferedImage img) {
         }
     }
 
-    public static String combineTextBlocks(List<TextBlock> textBlocks) {
-        Collections.sort(textBlocks, Comparator.comparingInt(o -> o.getTopLeft().y));
+    static String combineTextBlocks(List<TextBlock> textBlocks) {
+        textBlocks.sort(Comparator.comparingInt(o -> o.getTopLeft().y));
         List<List<TextBlock>> lineBlocks = new ArrayList<>();
         int lastY = -1;
         List<TextBlock> lineBlock = new ArrayList<>();
@@ -69,7 +69,7 @@ public static String combineTextBlocks(List<TextBlock> textBlocks) {
                 sameLine = textBlock.getTopLeft().y - lastY <= SAME_LINE_LIMIT;
             }
             if (!sameLine) {
-                Collections.sort(lineBlock, Comparator.comparingInt(o -> o.getTopLeft().x));
+                lineBlock.sort(Comparator.comparingInt(o -> o.getTopLeft().x));
                 lineBlocks.add(lineBlock);
                 lineBlock = new ArrayList<>();
                 sameLine = true;
@@ -78,7 +78,7 @@ public static String combineTextBlocks(List<TextBlock> textBlocks) {
             lineBlock.add(textBlock);
         }
         if (lineBlock.size() > 0) {
-            Collections.sort(lineBlock, Comparator.comparingInt(o -> o.getTopLeft().x));
+            lineBlock.sort(Comparator.comparingInt(o -> o.getTopLeft().x));
             lineBlocks.add(lineBlock);
         }
         StringBuilder sb = new StringBuilder();
@@ -99,16 +99,16 @@ public static String combineTextBlocks(List<TextBlock> textBlocks) {
         return sb.toString();
     }
 
-    public static Point frameToPoint(String text) {
+    static Point frameToPoint(String text) {
         String[] arr = text.split(",");
         return new Point(Integer.valueOf(arr[0].trim()), Integer.valueOf(arr[1].trim()));
     }
 
-    public static String postMultiData(String url, byte[] data, String boundary) {
+    static String postMultiData(String url, byte[] data, String boundary) {
         return postMultiData(url, data, boundary, "", "");
     }
 
-    public static String postMultiData(String url, byte[] data, String boundary, String cookie, String referer) {
+    private static String postMultiData(String url, byte[] data, String boundary, String cookie, String referer) {
         try {
             HttpRequest request = HttpUtil.createPost(url).timeout(15000);
             request.contentType("multipart/form-data; boundary=" + boundary);
@@ -127,7 +127,7 @@ public static String postMultiData(String url, byte[] data, String boundary, Str
         }
     }
 
-    public static byte[] mergeByte(byte[]... bytes) {
+    static byte[] mergeByte(byte[]... bytes) {
         int length = 0;
         for (byte[] b : bytes) {
             length += b.length;

src/main/java/com/luooqi/ocr/utils/GlobalKeyListener.java

@@ -2,7 +2,7 @@
 
 import cn.hutool.log.StaticLog;
 import com.luooqi.ocr.MainFm;
-import org.jnativehook.GlobalScreen;
+import com.luooqi.ocr.snap.ScreenCapture;
 import org.jnativehook.NativeInputEvent;
 import org.jnativehook.keyboard.NativeKeyEvent;
 import org.jnativehook.keyboard.NativeKeyListener;
@@ -22,8 +22,10 @@ public void nativeKeyPressed(NativeKeyEvent e) {
             MainFm.doSnap();
         }
         else if (e.getKeyCode() == NativeKeyEvent.VC_ESCAPE){
-            preventEvent(e);
-            MainFm.cancelSnap();
+            if (ScreenCapture.isSnaping){
+                preventEvent(e);
+                MainFm.cancelSnap();
+            }
         }
     }