fix

src/helpers/communication.ts

@@ -54,10 +54,15 @@ export const cancelEvaluating = () => {
 };
 
 /** 评测开始录音 */
-export const startRecording = (): Promise<IPostMessage | undefined> => {
+export const api_startRecording = (): Promise<IPostMessage | undefined> => {
 	if (!storeData.isApp) return Promise.resolve({} as any);
 	return promisefiyPostMessage({ api: "startRecording" });
 };
+/** 评测结束录音 */
+export const api_stopRecording = (): Promise<IPostMessage | undefined> => {
+	if (!storeData.isApp) return Promise.resolve({} as any);
+	return promisefiyPostMessage({ api: "stopRecording" });
+};
 
 /** 和websocket通信 */
 export const api_proxyServiceMessage = (content: any): Promise<IPostMessage | undefined> => {

src/helpers/formateMusic.ts

@@ -827,6 +827,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			// 如果有节拍器,需要将节拍器的时间算出来
 			if (i === 0) {
 				fixtime += getFixTime(beatSpeed);
+				state.fixtime = fixtime;
 				console.log("🚀 ~ fixtime:", fixtime, beatSpeed);
 			}
 			// console.log(getTimeByBeatUnit(beatUnit, measureSpeed, iterator.currentMeasure.activeTimeSignature.Denominator))

src/page-orchestra/evaluat-model/index.tsx

@@ -60,6 +60,7 @@ export default defineComponent({
 
 		/** 生成评测曲谱数据 */
 		const formatTimes = () => {
+			const difftime = state.times[0]?.difftime || 0;
 			let starTime = 0;
 			let ListenMode = false;
 			let dontEvaluatingMode = false;
@@ -73,7 +74,7 @@ export default defineComponent({
 				times = state.times.filter((n: any, index: number) => {
 					return index >= startIndex && index <= endIndex;
 				});
-				starTime = times[0].time;
+				starTime = times[0].sourceRelativeTime || times[0].relativeTime;
 				console.log("🚀 ~ times", times);
 			}
 			let measureIndex = -1;
@@ -82,8 +83,9 @@ export default defineComponent({
 				const item = times[index];
 				const note = getNoteByMeasuresSlursStart(item);
 				const rate = state.speed / state.originSpeed;
-				const start = item.time - starTime;
-				const end = item.endtime - starTime;
+				
+				const start = difftime + (item.sourceRelativeTime || item.relativeTime) - starTime;
+				const end = difftime + (item.sourceRelaEndtime || item.relaEndtime) - starTime;
 				const isStaccato = note.noteElement.voiceEntry.isStaccato();
 				const noteRate = isStaccato ? 0.5 : 1;
 				if (note.formatLyricsEntries.contains("Play") || note.formatLyricsEntries.contains("Play...")) {
@@ -109,19 +111,19 @@ export default defineComponent({
 				// console.log(note.measureOpenIndex, item.measureOpenIndex, note);
 				// console.log("skip", skip)
 				if (note.measureOpenIndex != recordMeasure) {
-					measureIndex++;
-					recordMeasure = note.measureOpenIndex;
-				}
+					measureIndex++
+					recordMeasure = note.measureOpenIndex
+				  }
 				const data = {
-					timeStamp: start / rate,
-					duration: (end / rate - start / rate) * noteRate,
+					timeStamp: (start * 1000) / rate,
+					duration: ((end * 1000) / rate - (start * 1000) / rate) * noteRate,
 					frequency: item.frequency,
 					nextFrequency: item.nextFrequency,
 					prevFrequency: item.prevFrequency,
 					// 重复的情况index会自然累加,render的index是谱面渲染的index
 					measureIndex: measureIndex,
 					measureRenderIndex: item.measureListIndex,
-					dontEvaluating: ListenMode || dontEvaluatingMode,
+					dontEvaluating: ListenMode || dontEvaluatingMode || item.skipMode,
 					musicalNotesIndex: index,
 					denominator: note.noteElement?.Length.denominator,
 					isOrnament: !!note?.voiceEntry?.ornamentContainer,

src/view/evaluating/index.tsx

@@ -11,12 +11,14 @@ import {
 	removeResult,
 	sendResult,
 	startEvaluating,
-	startRecording,
 	startSoundCheck,
     api_openWebView,
+	api_startRecording,
+	api_stopRecording,
 } from "/src/helpers/communication";
 import state, { clearSelection, handleStopPlay, resetPlaybackToStart, togglePlay } from "/src/state";
 import { IPostMessage } from "/src/utils/native-message";
+import { usePageVisibility } from "@vant/use";
 export const evaluatingData = reactive({
     /** 评测模块是否加载完成 */
     rendered: false,
@@ -191,7 +193,8 @@ export const handleStartBegin = async () => {
 		evaluatingData.startBegin = false;
 		return
 	}
-	await startRecording();
+	// 开始录音
+	api_startRecording();
 };
 
 /**
@@ -202,6 +205,9 @@ export const handleEndEvaluat = () => {
 	// 没有开始评测 , 不是评测模式 , 不评分
 	if (!evaluatingData.startBegin || state.modeType !== 'evaluating') return
 	evaluatingData.startBegin = false;
+	// 结束录音
+	api_stopRecording();
+	// 结束评测
 	endEvaluating({
 		musicScoreId: state.examSongId,
 	});
@@ -255,6 +261,13 @@ export const handleViewReport = () => {
 export default defineComponent({
 	name: "evaluating",
 	setup() {
+		const pageVisibility = usePageVisibility();
+
+		watch(pageVisibility, (value) => {
+			if (value == 'hidden' && evaluatingData.startBegin){
+				handleEndBegin()
+			}
+		});
         onMounted(() => {
 			evaluatingData.resultData = {}
             // evaluatingData.resultData = {...getLeveByScore(90), score: 30, intonation: 10, cadence: 30, integrity: 40}