Browse Source

fix: bug修复

TIANYONG 11 months ago
parent
commit
495f48519d

+ 1 - 1
src/helpers/formateMusic.ts

@@ -1163,7 +1163,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				if (["2670"].includes(state.cbsExamSongId)) {
 					// fixtime -= _firstMeasureRealValue * formatBeatUnit(beatUnit) * (60 / beatSpeed);
 				} else {
-					if (difftime > 0) {
+					if (difftime > 0 && !state.isEvxml) {
 						fixtime += difftime;
 						state.fixtime = fixtime;
 					}

+ 1 - 0
src/page-instrument/evaluat-model/evaluat-result/index.tsx

@@ -75,6 +75,7 @@ export default defineComponent({
       if (res?.code === 200) {
         evaluatingData.resultData.recordId = res.data;
       }
+      evaluatingData.needReplayEvaluat = evaluatingData.oneselfCancleEvaluating ? true : false;
       data.saveLoading = false;
     };
 

+ 4 - 1
src/page-instrument/evaluat-model/index.tsx

@@ -332,6 +332,8 @@ export default defineComponent({
         evaluatingData.oneselfCancleEvaluating = true;
         // handleCancelEvaluat();
         handleEndEvaluat(true, 'selfCancel');
+        evaluatingData.isBeginMask = true;
+        state.playState = "paused";
       }
       resetPlaybackToStart();
       evaluatingData.resulstMode = false;
@@ -370,6 +372,7 @@ export default defineComponent({
     };
 
     const startBtnHandle = async () => {
+      evaluatingData.needReplayEvaluat = false;
       // 选段未完成时,清除选段状态
       if (state.sectionStatus && state.section.length < 2) {
         clearSelection();
@@ -448,7 +451,7 @@ export default defineComponent({
 
     // 手动取消评测,需要自动再次评测
     watch(
-      () => evaluatingData.hideResultModal,
+      () => evaluatingData.needReplayEvaluat,
       (val) => {
         if (val && evaluatingData.oneselfCancleEvaluating) {
           setTimeout(() => {

+ 1 - 0
src/view/audio-list/index.tsx

@@ -224,6 +224,7 @@ export default defineComponent({
 		// 监听评测曲谱音频播放进度,返回
 		const progress = (res: any) => {
 			const currentTime = res?.currentTime || res?.content?.currentTime;
+			console.log('app进度时间',currentTime)
 			const total = res?.totalDuration || res?.content?.totalDuration;
 			const time = currentTime / 1000;
 			audioData.progress = time;

+ 1 - 0
src/view/evaluating/index.tsx

@@ -111,6 +111,7 @@ export const evaluatingData = reactive({
   recordingTime: 0, // 调用startRecording的时间 
   endEvaluatingTime: 0, // 调用endEvaluating的时间 
   evaluatSpeed: 0, // 评测记录的速度
+  needReplayEvaluat: false, // 手动取消评测,需要自动开始评测
 });
 
 const sendOffsetTime = async (offsetTime: number) => {