Przeglądaj źródła

mod:打开相机方式 调整

panqiuyao 7 miesięcy temu
rodzic
commit
ab7f9f7b43
1 zmienionych plików z 15 dodań i 18 usunięć
  1. 15 18
      electron/controller/camera.js

+ 15 - 18
electron/controller/camera.js

@@ -69,7 +69,7 @@ async function checkCameraControlCmdExists() {
 
 
 async function openCameraControlCmd() {
- return  new Promise(async (resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     try {
       // 获取 digiCamControl 文件夹路径
       const digiCamControlPath = config.digiCamControl;
@@ -79,23 +79,19 @@ async function openCameraControlCmd() {
 
       // 检查文件是否存在
       await fs.promises.access(exePath, fs.constants.F_OK);
-      try {
-
-          const child = spawn(exePath);
-
-          child.stdout.on('data', (data) => {
-
-            resolve(true)
-          });
-
-          child.on('close', (code) => {
-            if (code === 0) {
-              reject(false)
-            }
-          });
-
-
 
+      try {
+        // 替换为 execFile
+        const { execFile } = require('child_process');
+        execFile(exePath, (error, stdout, stderr) => {
+          if (error) {
+            console.error('执行 CameraControl.exe 出错:', error);
+            reject(false);
+            return;
+          }
+          console.log('CameraControl.exe 输出:', stdout);
+          resolve(true);
+        });
       } catch (error) {
         console.error('error CameraControlCmd.exe:', error);
         throw error;
@@ -106,7 +102,7 @@ async function openCameraControlCmd() {
       console.error('无法找到或运行 CameraControlCmd.exe:', error);
       throw error;
     }
-  })
+  });
 }
 
 function closeCameraControlTips() {
@@ -240,3 +236,4 @@ class CameraController extends Controller {
 
 CameraController.toString = () => '[class CameraController]';
 module.exports = CameraController;
+