.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-2022, ubuntu-latest]
+        os: [macos-latest, windows-2019, ubuntu-latest]
 
     # create steps
     steps:

feature/src/views/settings/index.vue

@@ -274,16 +274,12 @@ const state = reactive({
   custom: {},
 });
 
-// 添加lastKeyPressTime变量来跟踪按键时间
-const lastKeyPressTime = ref(0);
-const DOUBLE_CLICK_THRESHOLD = 300; // 双击时间阈值（毫秒）
-
 const isWindows = window?.rubick?.isWindows();
 const tipText = computed(() => {
   const optionKeyName = isWindows ? 'Alt' : 'Option、Command';
   return t('feature.settings.global.addShortcutKeyTips', {
     optionKeyName: optionKeyName,
-  }) + `此外你也可以双击修饰键如（Ctrl+Ctrl）`;
+  });
 });
 
 const currentSelect = ref(['userInfo']);
@@ -318,60 +314,33 @@ watch(state, setConfig);
 
 const changeShortCut = (e, key) => {
   let compose = '';
-  const currentTime = Date.now();
+  // 添加是否包含功能键的判断
-  const isDoubleClick = currentTime - lastKeyPressTime.value < DOUBLE_CLICK_THRESHOLD;
+  let incluFuncKeys = false;
-  lastKeyPressTime.value = currentTime;
-
-  // 处理 F1-F12 功能键
-  if (e.keyCode >= 112 && e.keyCode <= 123) {
-    state.shortCut[key] = keycodes[e.keyCode].toUpperCase();
-    return;
-  }
-
-  // 处理双击功能键的情况
-  if (isDoubleClick) {
-    if (e.keyCode === 17) { // Ctrl
-      state.shortCut[key] = 'Ctrl+Ctrl';
-      return;
-    }
-    if (e.keyCode === 18) { // Alt
-      state.shortCut[key] = 'Option+Option';
-      return;
-    }
-    if (e.keyCode === 16) { // Shift
-      state.shortCut[key] = 'Shift+Shift';
-      return;
-    }
-    if (e.keyCode === 93) { // Command
-      state.shortCut[key] = 'Command+Command';
-      return;
-    }
-  }
-
-  // 处理功能键+普通键的组合
-  let hasModifierKey = false;
-  
   if (e.ctrlKey && e.keyCode !== 17) {
     compose += '+Ctrl';
-    hasModifierKey = true;
+    incluFuncKeys = true;
   }
   if (e.shiftKey && e.keyCode !== 16) {
     compose += '+Shift';
-    hasModifierKey = true;
+    incluFuncKeys = true;
   }
   if (e.altKey && e.keyCode !== 18) {
     compose += '+Option';
-    hasModifierKey = true;
+    incluFuncKeys = true;
   }
   if (e.metaKey && e.keyCode !== 93) {
     compose += '+Command';
-    hasModifierKey = true;
+    incluFuncKeys = true;
   }
-
+  compose += '+' + keycodes[e.keyCode].toUpperCase();
-  // 只有当有修饰键时才添加普通键
+  compose = compose.substring(1);
-  if (hasModifierKey) {
+  if (
-    compose += '+' + keycodes[e.keyCode].toUpperCase();
+    incluFuncKeys &&
-    compose = compose.substring(1);
+    e.keyCode !== 16 &&
+    e.keyCode !== 17 &&
+    e.keyCode !== 18 &&
+    e.keyCode !== 93
+  ) {
     state.shortCut[key] = compose;
   } else {
     // 不做处理

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.3.4",
+  "version": "4.3.3",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {
@@ -39,7 +39,6 @@
     "pouchdb-load": "^1.4.6",
     "pouchdb-replication-stream": "^1.2.9",
     "simple-plist": "0.2.1",
-    "uiohook-napi": "^1.5.4",
     "vue": "^3.0.0",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0",

src/common/constans/renderer.ts

@@ -4,6 +4,6 @@ import path from 'path';
 const appPath = app.getPath('userData');
 
 const PLUGIN_INSTALL_DIR = path.join(appPath, './rubick-plugins-new');
-const PLUGIN_HISTORY = 'rubick-plugin-history';
+const PLUGIN_HISTORY = 'rubick-local-start-app';
 
 export { PLUGIN_INSTALL_DIR, PLUGIN_HISTORY };

src/main/common/registerHotKey.ts

@@ -10,7 +10,6 @@ import {
 import screenCapture from '@/core/screen-capture';
 import localConfig from '@/main/common/initLocalConfig';
 import winPosition from './getWinPosition';
-import { uIOhook, UiohookKey } from 'uiohook-napi';
 
 const registerHotKey = (mainWindow: BrowserWindow): void => {
   // 设置开机启动
@@ -58,43 +57,27 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
     }
   };
 
-  // 显示主窗口
-  function mainWindowPopUp() {
-    const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
-    if (currentShow) return mainWindow.hide();
-    const { x: wx, y: wy } = winPosition.getPosition();
-    mainWindow.setAlwaysOnTop(false);
-    mainWindow.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
-    mainWindow.focus();
-    mainWindow.setVisibleOnAllWorkspaces(false, {
-      visibleOnFullScreen: true,
-    });
-    mainWindow.setPosition(wx, wy);
-    mainWindow.show();
-  }
-
   const init = async () => {
     await setAutoLogin();
     await setDarkMode();
     await setTheme();
     const config = await localConfig.getConfig();
     globalShortcut.unregisterAll();
-
     // 注册偏好快捷键
-    // 处理显示/隐藏快捷键的注册
+    globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
-    const doublePressShortcuts = ['Ctrl+Ctrl', 'Option+Option', 'Shift+Shift', 'Command+Command'];
+      const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
-    const isDoublePressShortcut = doublePressShortcuts.includes(config.perf.shortCut.showAndHidden);
+      if (currentShow) return mainWindow.hide();
-    
+      const { x: wx, y: wy } = winPosition.getPosition();
-    if (isDoublePressShortcut) {
+      mainWindow.setAlwaysOnTop(false);
-      // 双击快捷键（如 Ctrl+Ctrl）详见 uIOhookRegister 函数实现
+      mainWindow.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
-    } else {
+      mainWindow.focus();
-      // 注册普通快捷键（如 Ctrl+Space、F8 等）
+      mainWindow.setVisibleOnAllWorkspaces(false, {
-      globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
+        visibleOnFullScreen: true,
-        mainWindowPopUp();
       });
-    }
+      mainWindow.setPosition(wx, wy);
+      mainWindow.show();
+    });
 
-    // 截图快捷键
     globalShortcut.register(config.perf.shortCut.capture, () => {
       screenCapture(mainWindow, (data) => {
         data &&
@@ -124,48 +107,9 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
       });
     });
   };
-
-  uIOhookRegister(mainWindowPopUp);
   init();
   ipcMain.on('re-register', () => {
     init();
   });
 };
 export default registerHotKey;
-
-function uIOhookRegister(callback: () => void) {
-  let lastModifierPress = Date.now();
-  uIOhook.on('keydown', async (uio_event) => {
-    const config = await localConfig.getConfig(); // 此处还有优化空间
-
-    if (
-      ![
-        'Ctrl+Ctrl',
-        'Option+Option',
-        'Shift+Shift',
-        'Command+Command',
-      ].includes(config.perf.shortCut.showAndHidden)
-    ) {
-      return;
-    }
-
-    // 双击快捷键，如 Ctrl+Ctrl
-    const modifers = config.perf.shortCut.showAndHidden.split('+');
-    const showAndHiddenKeyStr = modifers.pop(); // Ctrl
-    const keyStr2uioKeyCode = {
-      Ctrl: UiohookKey.Ctrl,
-      Shift: UiohookKey.Shift,
-      Option: UiohookKey.Alt,
-      Command: UiohookKey.Comma,
-    };
-
-    if (uio_event.keycode === keyStr2uioKeyCode[showAndHiddenKeyStr]) {
-      const currentTime = Date.now();
-      if (currentTime - lastModifierPress < 300) {
-        callback(); // 调用 mainWindowPopUp
-      }
-      lastModifierPress = currentTime;
-    }
-  });
-  uIOhook.start();
-}

src/renderer/plugins-manager/index.ts

@@ -46,7 +46,7 @@ const createPluginManager = (): any => {
   const initLocalStartPlugin = () => {
     const result = ipcRenderer.sendSync('msg-trigger', {
       type: 'dbGet',
-      data: { id: 'rubick-local-start-app' },
+      data: { id: PLUGIN_HISTORY },
     });
     if (result && result.value) {
       appList.value.push(...result.value);