Merge branch 'master' of https://github.com/clouDr-f2e/rubick into master

README.md

@@ -18,7 +18,7 @@
 之所以做这个工具箱一方面是 utools 本身并未开源，但是公司内部的工具库又无法发布到 utools 插件中，所以为了既要享受 utools 生态又要有定制化需求，我们自己参考 utools 设计，做了 Rubick
 
 ## 安装包
-* [Rubick Mac OS V0.0.1](https://github.com/clouDr-f2e/rubick/releases/download/v0.0.1-beta/rubick2-0.0.1.pkg)
+* [Rubick Mac OS V0.0.1](https://github.com/clouDr-f2e/rubick/releases/tag/v0.0.1-beta.2)
 
 ## 支持能力
 

src/main/common/common.js

@@ -155,13 +155,29 @@ export default function init(mainWindow) {
   // 拾色器
   ipcMain.on('start-picker', () => {
     // 开启输入侦测
-    ioHook.start(false)
+    ioHook.start(false);
+    ioHook.load();
     picker.init();
 
     picker.getWindow().on('close', () => {
       ioHook.stop();
+      ioHook.unload();
     });
 
+    let pos = robot.getMousePos();
+    picker
+      .getWindow()
+      .setPosition(parseInt(pos.x) - 50, parseInt(pos.y) - 50);
+
+    picker
+      .getWindow()
+      .webContents.send(
+      "updatePicker",
+      robot.getPixelColor(pos.x, pos.y)
+    );
+
+    ipcMain.on("closePicker", closePicker);
+  });
 
   ioHook.on('mousemove', e => {
     let x = e.x
@@ -183,25 +199,11 @@ export default function init(mainWindow) {
     }
   });
 
-    let pos = robot.getMousePos();
-    picker
-      .getWindow()
-      .setPosition(parseInt(pos.x) - 50, parseInt(pos.y) - 50);
-
-    picker
-      .getWindow()
-      .webContents.send(
-      "updatePicker",
-      robot.getPixelColor(pos.x, pos.y)
-    );
-
-    ipcMain.on("closePicker", closePicker);
   ioHook.on('mouseup', e => {
     if (e.button === 3) {
       closePicker()
     }
   });
-  })
 }