Explorar el Código

fix 摄像头信息读取

Michael Wang hace 6 años
padre
commit
3fff9b2814
Se han modificado 1 ficheros con 21 adiciones y 12 borrados
  1. 21 12
      src/components/FaceRecognition/FaceRecognition.vue

+ 21 - 12
src/components/FaceRecognition/FaceRecognition.vue

@@ -24,6 +24,8 @@
 <script>
 import { mapState as globalMapState } from "vuex";
 import { createNamespacedHelpers } from "vuex";
+import { Promise } from "q";
+import { resolve } from "path";
 const { mapState, mapMutations } = createNamespacedHelpers("examingHomeModule");
 
 export default {
@@ -274,18 +276,25 @@ export default {
             var fs = window.nodeRequire("fs");
             if (!fs.existsSync("multiCamera.exe")) return;
 
-            window.nodeRequire("node-cmd").get("multiCamera.exe", () => {
-              cameraInfos = fs.readFileSync("CameraInfo.txt", "utf-8");
-              if (cameraInfos && cameraInfos.trim()) {
-                cameraInfos = cameraInfos.trim();
-                cameraInfos = cameraInfos.replace(/\r\n/g, "");
-                cameraInfos = cameraInfos.replace(/\n/g, "");
-                console.log(cameraInfos);
-                this.serverLog("debug/S-001001", cameraInfos);
-              }
-              if (cameraInfos.includes("")) {
-                hasVirtualCamera = true;
-              }
+            await new Promise((resolve, reject) => {
+              window.nodeRequire("node-cmd").get("multiCamera.exe", () => {
+                try {
+                  cameraInfos = fs.readFileSync("CameraInfo.txt", "utf-8");
+                  if (cameraInfos && cameraInfos.trim()) {
+                    cameraInfos = cameraInfos.trim();
+                    cameraInfos = cameraInfos.replace(/\r\n/g, "");
+                    cameraInfos = cameraInfos.replace(/\n/g, "");
+                    console.log(cameraInfos);
+                    this.serverLog("debug/S-001001", cameraInfos);
+                  }
+                  if (cameraInfos.includes("")) {
+                    hasVirtualCamera = true;
+                  }
+                  resolve();
+                } catch (error) {
+                  reject("读取摄像头列表失败");
+                }
+              });
             });
           } catch (error) {
             console.log(error);