Merge branch 'main' of http://gitlab.sugrsugr.com/skye/jensen into useWorker

src/utils/jensen.js

@@ -984,14 +984,16 @@ Jensen.prototype.sendScheduleInfo = function (infos) {
       if (shortcutKeys[info.platform] && shortcutKeys[info.platform][info.os]) {
         codes = shortcutKeys[info.platform][info.os];
       }
-      let startDate = new Array(7).fill(0);
-      let endDate = new Array(7).fill(0);
+      let startDate = new Array(8).fill(0);
+      let endDate = new Array(8).fill(0);
       if (info.startDate && info.endDate) {
         startDate = sliceTime(formatTime(info.startDate));
         endDate = sliceTime(formatTime(info.endDate));
+        startDate.push(0x00);
+        endDate.push(0x00);
       }
-      const reserved = 0x00; // 预留
-      bodys = bodys.concat([...startDate, ...endDate, reserved, ...codes]);
+      const reserved = [0x00, 0x00]; // 预留
+      bodys = bodys.concat([...startDate, ...endDate, ...reserved, ...codes]);
     }
     console.log('send schedule info', infos, bodys);
     return this.send(new Command(SCHEDULE_INFO).body(bodys));

src/utils/utils.js

@@ -174,7 +174,7 @@ const enterKeyCode = (answer = 0, hangup = 0, reject = 0, micMute = 0) => {
   if (hangup) code |= 0x01 << 1;
   if (reject) code |= 0x01 << 2;
   if (micMute) code |= 0x01 << 3;
-  return code;
+  return [0x00, code];
 };
 
 const emptyCodes = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -182,130 +182,148 @@ const emptyCodes = [0, 0, 0, 0, 0, 0, 0, 0];
 export const shortcutKeys = {
   zoom: {
     Windows: [
-      enterKeyCode(0, 1),
+      ...enterKeyCode(0, 1),
       ...HotKeyBuilder.build(0x04, 0x01),
       ...HotKeyBuilder.withAlt().withKey('Q').build(),
       ...HotKeyBuilder.build(0x04, 0x10),
       ...HotKeyBuilder.withAlt().withKey('A').build()
     ],
     Mac: [
-      enterKeyCode(0, 1),
+      ...enterKeyCode(0, 1),
       ...HotKeyBuilder.build(0x04, 0x01),
       ...HotKeyBuilder.withGuiKey().withKey('W').build(),
       ...HotKeyBuilder.build(0x04, 0x10),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('A').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   teams: {
     Windows: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...HotKeyBuilder.withControl().withShift().withKey('A').build(),
       ...HotKeyBuilder.withControl().withShift().withKey('H').build(),
       ...HotKeyBuilder.withControl().withShift().withKey('D').build(),
       ...HotKeyBuilder.withControl().withShift().withKey('M').build()
     ],
     Mac: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('A').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('H').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('M').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   'google-meeting': {
-    Windows: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withControl().withKey('D').build()],
-    Mac: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withKey('D').build()],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Windows: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withControl().withKey('D').build()],
+    Mac: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withKey('D').build()],
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   webex: {
     Windows: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...HotKeyBuilder.withControl().withShift().withKey('C').build(),
       ...HotKeyBuilder.withControl().withKey('L').build(),
       ...HotKeyBuilder.withControl().withKey('D').build(),
       ...HotKeyBuilder.withControl().withKey('M').build()
     ],
     Mac: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...HotKeyBuilder.withControl().withShift().withKey('C').build(),
       ...HotKeyBuilder.withGuiKey().withKey('L').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('M').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   feishu: {
-    Windows: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withControl().withShift().withKey('D').build()],
-    Mac: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build()],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Windows: [
+      ...enterKeyCode(),
+      ...emptyCodes,
+      ...emptyCodes,
+      ...emptyCodes,
+      ...HotKeyBuilder.withControl().withShift().withKey('D').build()
+    ],
+    Mac: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build()],
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   lark: {
-    Windows: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withControl().withShift().withKey('D').build()],
-    Mac: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build()],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Windows: [
+      ...enterKeyCode(),
+      ...emptyCodes,
+      ...emptyCodes,
+      ...emptyCodes,
+      ...HotKeyBuilder.withControl().withShift().withKey('D').build()
+    ],
+    Mac: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withShift().withKey('D').build()],
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   weChat: {
-    Windows: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
-    Mac: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Windows: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
+    Mac: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   line: {
     Windows: [
-      enterKeyCode(0, 1, 1),
+      ...enterKeyCode(0, 1, 1),
       ...emptyCodes,
       ...HotKeyBuilder.withKey('ESCAPE').build(),
       ...HotKeyBuilder.withKey('ESCAPE').build(),
       ...HotKeyBuilder.withControl().withShift().withKey('A').build()
     ],
     Mac: [
-      enterKeyCode(0, 1, 1),
+      ...enterKeyCode(0, 1, 1),
       ...emptyCodes,
       ...HotKeyBuilder.withKey('ESCAPE').build(),
       ...HotKeyBuilder.withKey('ESCAPE').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('A').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   'whats-app': {
-    Windows: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
+    Windows: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes],
     Mac: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...emptyCodes,
       ...HotKeyBuilder.withGuiKey().withKey('W').build(),
       ...HotKeyBuilder.withGuiKey().withKey('W').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('M').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   slack: {
     Windows: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...emptyCodes,
       ...emptyCodes,
       ...emptyCodes,
       ...HotKeyBuilder.withControl().withShift().withKey('SPACE').build()
     ],
-    Mac: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...HotKeyBuilder.withGuiKey().withShift().withKey('SPACE').build()],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Mac: [
+      ...enterKeyCode(),
+      ...emptyCodes,
+      ...emptyCodes,
+      ...emptyCodes,
+      ...HotKeyBuilder.withGuiKey().withShift().withKey('SPACE').build()
+    ],
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   },
   discord: {
     Windows: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       HotKeyBuilder.withControl().withKey('ENTER').build(),
       ...emptyCodes,
       ...HotKeyBuilder.withKey('ESCAPE').build(),
       ...HotKeyBuilder.withControl().withShift().withKey('M').build()
     ],
     Mac: [
-      enterKeyCode(),
+      ...enterKeyCode(),
       ...HotKeyBuilder.withGuiKey().withKey('ENTER').build(),
       ...emptyCodes,
       ...HotKeyBuilder.withGuiKey().withKey('ESCAPE').build(),
       ...HotKeyBuilder.withGuiKey().withShift().withKey('M').build()
     ],
-    Linux: [enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
+    Linux: [...enterKeyCode(), ...emptyCodes, ...emptyCodes, ...emptyCodes, ...emptyCodes]
   }
 };