mod:关闭 提示砍

electron/api/camera.js

@@ -1,7 +1,7 @@
 const axios = require('axios');
 const http = require('http');
 const { net } = require('electron');
-
+const { post } = require('./request')
 //
 const baseURL = 'http://localhost:5513/';
 // 创建 Axios 实例
@@ -90,6 +90,11 @@ module.exports = {
       url: `?slc=set&param1=${params.key}&param2=${params.value}`
     })
   },
+  closeOtherWindow(){
+    return post({
+      url: '/close_other_window',
+    })
+  },
 }
 
 

electron/controller/camera.js

@@ -4,7 +4,8 @@ const path = require('path');
 const fs = require('fs');
 const { Controller } = require('ee-core');
 const { spawn } = require('child_process');
-const { liveShow, liveHide, setParams, capture, getParams,CMD,captureLive } = require('../api/camera');
+const { liveShow, liveHide, setParams, capture, getParams,CMD,captureLive,closeOtherWindow } = require('../api/camera');
+
 const { dialog } = require('electron'); // 引入 electron 的 dialog 模块
 const { windowManager } = require('node-window-manager');
 // 检查并读取配置文件
@@ -109,10 +110,10 @@ async function openCameraControlCmd() {
   })
 }
 
-function closeCameraControlTips() {
+async function closeCameraControlTips() {
   try {
-
-    const windows = windowManager.getWindows();
+    await  closeOtherWindow()
+/*    const windows = windowManager.getWindows();
 
     for (const window of windows) {
       const title = window.getTitle();
@@ -124,7 +125,7 @@ function closeCameraControlTips() {
         //   window.hide()
       //  break;
       }
-    }
+    }*/
   }catch (e) {
     console.log(e)
   }
@@ -145,7 +146,7 @@ class CameraController extends Controller {
       if(!isOPen){
         await checkCameraControlCmdExists()
         await  CMD('All_Minimize')
-        closeCameraControlTips()
+        await closeCameraControlTips()
         isOPen = true
       }