Jelajahi Sumber

feat: 切换声轨关闭摄像头

TIANYONG 5 bulan lalu
induk
melakukan
b472b729fe

+ 2 - 2
src/page-instrument/header-top/index.module.less

@@ -531,14 +531,14 @@
         }
         .vipIcon {
             position: absolute;
-            left: 26px;
+            left: 13.5%;
             top: 12px;
             width: 55px;
             height: 21px;
         }
         .svipIcon {
             position: absolute;
-            left: 26px;
+            left: 13.5%;
             top: 12px;
             width: 63px;
             height: 21px;

+ 1 - 0
src/page-instrument/header-top/settting/index.tsx

@@ -190,6 +190,7 @@ export default defineComponent({
                                         modelValue={state.setting.camera}
                                         onChange={ async (value) => {
                                             if (value) {
+                                                console.log('打开摄像头')
                                                 const res = await api_openCamera();
                                                 // 没有授权
                                                 if (res?.content?.reson) {

+ 4 - 2
src/view/evaluating/index.tsx

@@ -21,6 +21,7 @@ import {
   api_remove_recordStartTime,
   api_startCapture,
   api_endCapture,
+  api_closeCamera,
   api_getDeviceDelay,
   hideComplexButton,
   api_checkSocketStatus,
@@ -545,7 +546,7 @@ export const handleEndEvaluat = (isComplete = false, endType?: string) => {
   evaluatingData.isComplete = isComplete;
   // 如果开启了摄像头, 结束录制视频
   if (state.setting.camera) {
-    console.log("结束录制视频");
+    console.log("结束录制视频1");
     api_endCapture();
   }
 };
@@ -604,8 +605,9 @@ export const handleCancelEvaluat = (cancelType?: string) => {
   });
   // 如果开启了摄像头, 结束录制视频
   if (state.setting.camera) {
-    console.log("结束录制视频");
+    console.log("结束录制视频2");
     api_endCapture();
+    api_closeCamera();
   }
 };
 

+ 1 - 1
src/view/fingering/index.module.less

@@ -152,7 +152,7 @@
   font-size: 12Px;
   opacity: 0;
   pointer-events: none;
-
+  z-index: 1;
   &:active {
     opacity: .8;
   }

+ 5 - 0
src/view/plugins/toggleMusicSheet/index.tsx

@@ -10,6 +10,7 @@ import useDrag from "/src/view/plugins/useDrag/index";
 import Dragbom from "/src/view/plugins/useDrag/dragbom";
 import { setGuidance } from "/src/page-instrument/custom-plugins/guide-page/api";
 import { storeData } from "/src/store";
+import { api_closeCamera } from "/src/helpers/communication";
 
 export const toggleMusicSheet = reactive({
   show: false,
@@ -80,6 +81,10 @@ export default defineComponent({
           isHideLoading: true
         })
       console.log(_url)
+      // 如果开启了摄像头, 结束录制视频
+      if (state.setting.camera) {
+        api_closeCamera();
+      }
       location.href = _url
     }