Merge branch 'feature-tianyong' into klx-test

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

@@ -10,7 +10,7 @@ import { getNoteByMeasuresSlursStart } from "/src/helpers/formateMusic";
 import { Icon, Popup, showToast, closeToast, showLoadingToast } from "vant";
 import EvaluatResult from "./evaluat-result";
 import EvaluatAudio from "./evaluat-audio";
-import { api_getDeviceDelay, api_openAdjustRecording, api_proxyServiceMessage, api_videoUpdate, getEarphone, api_back, api_startDelayCheck, api_cancelDelayCheck, api_remove_cancelDelayCheck, api_closeDelayCheck, api_finishDelayCheck, api_retryEvaluating, api_remove_finishDelayCheck } from "/src/helpers/communication";
+import { api_getDeviceDelay, api_openAdjustRecording, api_proxyServiceMessage, api_videoUpdate, getEarphone, api_back, api_startDelayCheck, api_cancelDelayCheck, api_remove_cancelDelayCheck, api_closeDelayCheck, api_finishDelayCheck, api_retryEvaluating, api_remove_finishDelayCheck, api_cloudSuspend } from "/src/helpers/communication";
 import EvaluatShare from "./evaluat-share";
 import { Vue3Lottie } from "vue3-lottie";
 import startData from "./data/start.json";
@@ -390,6 +390,12 @@ export default defineComponent({
       } else if (type === "tryagain") {
         startBtnHandle();
       } else if (type === "selfCancel") {
+        // 如果是midi的曲子，需要暂停midi播放
+        if (state.isAppPlay) {
+          api_cloudSuspend({
+            songID: state.examSongId,
+          })
+        }
         // 再来一次，需要手动取消评测，不生成评测记录，不显示评测结果弹窗
         evaluatingData.oneselfCancleEvaluating = true;
         // handleCancelEvaluat();

src/view/audio-list/index.tsx

@@ -369,6 +369,7 @@ export const handleLoadBeatMusic = async () => {
 
 // 切换对应的声轨，并且配置当前的audio
 export async function changeCombineAudio (combineIndex: number){
+	const currentTime = getAudioCurrentTime()
 	// 重复点击的时候取消选中 原音
 	if(combineIndex === audioData.combineIndex){
 		audioData.combineIndex = -1
@@ -380,6 +381,8 @@ export async function changeCombineAudio (combineIndex: number){
 		if(!state.accompany) {
 			state.noMusicSource = true
 		}
+		//设置进度
+		setAudioCurrentTime(currentTime)
 		return
 	}
 	state.loadingText = "资源加载中，请稍后…";
@@ -432,6 +435,8 @@ export async function changeCombineAudio (combineIndex: number){
 	if(!state.accompany) {
 		state.noMusicSource = false
 	}
+	//设置进度
+	setAudioCurrentTime(currentTime)
 	showToast({
 		message:  "已开启原声",
 		position: "top",