Browse Source

mod:node-window-manager 新增窗口句柄管理,关闭CameraControl 窗口

panqiuyao 8 months ago
parent
commit
142a5c411a
2 changed files with 24 additions and 2 deletions
  1. 23 2
      electron/controller/camera.js
  2. 1 0
      package.json

+ 23 - 2
electron/controller/camera.js

@@ -6,7 +6,7 @@ const { Controller } = require('ee-core');
 const { spawn } = require('child_process');
 const { liveShow, liveHide, setParams, capture, getParams,CMD } = require('../api/camera');
 const { dialog } = require('electron'); // 引入 electron 的 dialog 模块
-
+const { windowManager } = require('node-window-manager');
 // 检查并读取配置文件
 function readConfigFile(configPath) {
   try {
@@ -109,6 +109,27 @@ async function openCameraControlCmd() {
   })
 }
 
+function closeCameraControlTips() {
+  try {
+
+    const windows = windowManager.getWindows();
+
+    for (const window of windows) {
+      const title = window.getTitle();
+
+      if (title === "digiCamControl by Duka Istvan") {
+        console.log(title);
+        window.hide()
+        break;
+      }
+    }
+  }catch (e) {
+    console.log(e)
+  }
+
+
+}
+
 class CameraController extends Controller {
   constructor(ctx) {
     super(ctx);
@@ -118,9 +139,9 @@ class CameraController extends Controller {
     const win = this.app.electron.mainWindow;
     try {
   //    win.setAlwaysOnTop(true); // 置顶
-      console.log('aaaa')
        await checkCameraControlCmdExists()
       await  CMD('All_Minimize')
+      closeCameraControlTips()
   //    win.setAlwaysOnTop(false); // 置顶
 
       const res = await getParams('iso')

+ 1 - 0
package.json

@@ -62,6 +62,7 @@
     "ee-core": "2.12.0",
     "electron-updater": "5.3.0",
     "lodash": "4.17.21",
+    "node-window-manager": "^2.2.4",
     "ws": "8.18.1"
   }
 }