Ver Fonte

fix(electron): 优化摄像头控制逻辑

- 添加日志模块引用
- 在摄像头设备状态为 -1 时增加 10秒等待时间
- 修复摄像头设备状态为 2 时未设置 isOPen 的问题
panqiuyao há 5 meses atrás
pai
commit
db35233bd4
1 ficheiros alterados com 4 adições e 2 exclusões
  1. 4 2
      electron/controller/camera.js

+ 4 - 2
electron/controller/camera.js

@@ -1,5 +1,6 @@
 'use strict';
 'use strict';
 const { Controller } = require('ee-core');
 const { Controller } = require('ee-core');
+const Log = require('ee-core/log');
 const { checkCameraControlCmdExists, closeCameraControlTips} = require('../utils/camera');
 const { checkCameraControlCmdExists, closeCameraControlTips} = require('../utils/camera');
 const {
 const {
   checkCamera,
   checkCamera,
@@ -41,19 +42,20 @@ class CameraController extends Controller {
 
 
 
 
       }else{
       }else{
-
         let res = await checkCamera().catch(e=>{
         let res = await checkCamera().catch(e=>{
           isOPen = false;
           isOPen = false;
         })
         })
+
         if(res?.device_status  === -1 ){
         if(res?.device_status  === -1 ){
           isOPen = false;
           isOPen = false;
           await checkCameraControlCmdExists()
           await checkCameraControlCmdExists()
           isOPen = true
           isOPen = true
-
+          await new Promise(resolve => setTimeout(resolve, 10000)); // 等待5秒
           res = await checkCamera()
           res = await checkCamera()
         }
         }
 
 
         if(res?.device_status  === 2){
         if(res?.device_status  === 2){
+          isOPen = true;
           return  {
           return  {
             ...res,
             ...res,
             status:2
             status:2