refactor(camera): 重构相机控制逻辑

- 修改配置文件读取方式，使用 controlType 替代 type
- 优化相机控制路径获取逻辑
- 添加日志输出，便于调试
- 删除不必要的空返回语句

electron/api/camera.js

@@ -59,7 +59,7 @@ const { readConfigFile } = require('../utils/config');
 
 module.exports = {
   async liveShow(){
-    if(readConfigFile().type === 'digiCamContro'){
+    if(readConfigFile().controlType === 'digiCamControl'){
       return get({
         url: '?CMD=LiveViewWnd_Show'
       })
@@ -80,7 +80,7 @@ module.exports = {
     }
   },
   async liveHide(){
-    if(readConfigFile().type === 'digiCamContro'){
+    if(readConfigFile().controlType === 'digiCamControl'){
       return get({
         url: '?CMD=LiveViewWnd_Hide'
       })
@@ -101,27 +101,23 @@ module.exports = {
     }
   },
   captureLive(){
-    return  {}
     return get({
       url: '?CMD=LiveView_Capture'
     })
   },
   capture(){
-    return  {}
     return get({
       url: '?CMD=Capture'
     })
   },
 
   CMD(cmd){
-    return  {}
     return get({
       url: '?CMD='+cmd
     })
   },
 
   getParams(params){
-    return  {}
     return  fetchExampleData(`?slc=get&param1=${params}`)
   },
   setParams(params){
@@ -136,7 +132,7 @@ module.exports = {
     })
   },
   async checkCamera(){
-    if(readConfigFile().type === 'digiCamContro'){
+    if(readConfigFile().controlType === 'digiCamControl'){
       return  fetchExampleData(`?slc=get&param1=iso`)
     }else {
 

electron/controller/camera.js

@@ -16,14 +16,16 @@ class CameraController extends Controller {
 
   async connect() {
     try {
+      console.log('==================');
+      console.log(readConfigFile());
+      if(readConfigFile().controlType === 'digiCamControl'){
 
-      if(readConfigFile().type === 'digiCamContro'){
-
+        console.log('========1==========');
         await getParams('iso').catch(e=>{
           isOPen = false;
         })
         if(!isOPen){
-          await checkCameraControlCmdExists(digiCamControlPath)
+          await checkCameraControlCmdExists()
           await  CMD('All_Minimize')
           await closeCameraControlTips()
           isOPen = true
@@ -83,7 +85,7 @@ class CameraController extends Controller {
   async liveShow() {
     try {
       await liveShow();
-      if(readConfigFile().type === 'digiCamContro'){
+      if(readConfigFile().controlType === 'digiCamControl'){
         await  CMD('All_Minimize')
       }
       return true;

electron/utils/camera.js

@@ -22,10 +22,13 @@ const exe = {
 function getExePath () {
   let exePath =  ""
   if(readConfigFile().controlType === 'digiCamControl'){
-    exePath =  path.join( readConfigFile().digiCamControlPath, exe["digiCamControl"]);
+    exePath =  path.join( readConfigFile().controlPath || readConfigFile().digiCamControlPath, exe["digiCamControl"]);
   }else if(readConfigFile().controlType === 'SmartShooter'){
-    exePath =  path.join( readConfigFile().SmartShooterPath,  exe["SmartShooter"]);
+    exePath =  path.join( readConfigFile().controlPath || readConfigFile().SmartShooterPath,  exe["SmartShooter"]);
   }
+
+  console.log('ex============ePath');
+  console.log(exePath);
   return exePath
 }
 

electron/utils/config.default.json

@@ -2,7 +2,7 @@
   "openDevTools":false,
   "remoteUrl": false,
   "controlType": "SmartShooter",
-  "controlPath": "",
+  "controlPath": "C:\\Program Files\\Smart Shooter 5",
   "digiCamControlPath":"C:\\Program Files (x86)\\digiCamControl",
   "SmartShooterPath":"C:\\Program Files\\Smart Shooter 5",
   "pyapp": "127.0.0.1"