Forráskód Böngészése

Merge branch 'feature-tianyong'

TIANYONG 1 éve
szülő
commit
d79e624deb
2 módosított fájl, 6 hozzáadás és 4 törlés
  1. 1 1
      src/state.ts
  2. 5 3
      src/view/evaluating/index.tsx

+ 1 - 1
src/state.ts

@@ -562,7 +562,7 @@ export const setSection = (start: number, end: number, userSpeed?: number) => {
     lastEndNotes = newEndNotes.filter((n: any) => n.noteId === newLastEndId)
   }
 
-  const endIdx: any = isCanRepeat ? lastEndNotes.length - 1 : 0
+  const endIdx: any = (isCanRepeat && canRepeatInfo.repeatIdx == state.repeatInfo.length - 1) ? 1 : 0
   const startNote = startNotes[0]
   // const endNote = endNotes[endNotes.length - 1]
   const endNote = lastEndNotes[endIdx]			

+ 5 - 3
src/view/evaluating/index.tsx

@@ -353,9 +353,11 @@ export const handleEndEvaluat = (isComplete = false) => {
 	// 结束录音
 	api_stopRecording();
 	// 结束评测
-	endEvaluating({
-		musicScoreId: state.examSongId,
-	});
+	setTimeout(() => {
+		endEvaluating({
+			musicScoreId: state.examSongId,
+		});
+	}, 500);
 	showLoadingToast({
 		message: "评分中",
 		duration: 0,