Explorar el Código

mod:去掉置顶

panqiuyao hace 8 meses
padre
commit
1b820fdfe6
Se han modificado 2 ficheros con 5 adiciones y 4 borrados
  1. 3 3
      electron/controller/camera.js
  2. 2 1
      package.json

+ 3 - 3
electron/controller/camera.js

@@ -120,11 +120,11 @@ class CameraController extends Controller {
   async connect() {
     const win = this.app.electron.mainWindow;
     try {
-      win.setAlwaysOnTop(true); // 置顶
+  //    win.setAlwaysOnTop(true); // 置顶
       console.log('aaaa')
        await checkCameraControlCmdExists()
       await  CMD('All_Minimize')
-      win.setAlwaysOnTop(false); // 置顶
+  //    win.setAlwaysOnTop(false); // 置顶
 
       const res = await getParams('iso')
       if(res  === '未将对象引用设置到对象的实例。'){
@@ -139,7 +139,7 @@ class CameraController extends Controller {
       }
       return true;
     } catch (error) {
-      win.setAlwaysOnTop(false); // 置顶
+   //   win.setAlwaysOnTop(false); // 置顶
       return {
         status:-1,
         msg:"请安装digiCamControl软件,并打开digiCamControl软件的web服务,端口为5513",

+ 2 - 1
package.json

@@ -51,7 +51,7 @@
     "electron": "21.4.4",
     "electron-builder": "23.6.0",
     "eslint": "5.13.0",
-    "eslint-plugin-prettier": " -3.0.1",
+    "eslint-plugin-prettier": "3.0.1",
     "nodemon": "2.0.16"
   },
   "dependencies": {
@@ -59,6 +59,7 @@
     "dayjs": "1.10.7",
     "ee-core": "2.12.0",
     "electron-updater": "5.3.0",
+    "electron-window-manager": "^1.0.6",
     "lodash": "4.17.21",
     "ws": "8.18.1"
   }