Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

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, api_workUpdate } 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_workUpdate, api_cloudSuspend } from "/src/helpers/communication";
 import EvaluatShare from "./evaluat-share";
 import { Vue3Lottie } from "vue3-lottie";
 import startData from "./data/start.json";
@@ -230,7 +230,8 @@ export default defineComponent({
       if (preTimes.length) {
         for (let index = preTimes.length-1; index >= 0; index--) {
           const item = preTimes[index]
-          const note = getNoteByMeasuresSlursStart(item)
+          // const note = getNoteByMeasuresSlursStart(item)
+          const note = item
           if (note.formatLyricsEntries.contains('Play') || note.formatLyricsEntries.contains('Play...')) {
             preLyricsContent = 'Play'
             break
@@ -392,6 +393,12 @@ export default defineComponent({
          */
         // startBtnHandle();
       } else if (type === "selfCancel") {
+        // 如果是midi的曲子，需要暂停midi播放
+        if (state.isAppPlay) {
+          api_cloudSuspend({
+            songID: state.examSongId,
+          })
+        }        
         // 再来一次，需要手动取消评测，不生成评测记录，不显示评测结果弹窗
         evaluatingData.oneselfCancleEvaluating = true;
         // handleCancelEvaluat();

src/view/evaluating/index.tsx

@@ -347,6 +347,14 @@ const handleScoreResult = (res?: IPostMessage) => {
           evaluatingData.hideResultModal = true;
         }
         evaluatingData.resulstMode = evaluatingData.isErrorState ? false : true;
+        // 评测不足1秒，不保存记录，不显示评测结果弹窗
+        console.log('评测时长',evaluatingData.resultData.playTime)
+        if (evaluatingData.resultData.playTime / 1000 < 1) {
+          evaluatingData.resulstMode = false
+          showToast({
+            message: "评测时间过短，无法生成评分",
+          });
+        }
         evaluatingData.startBegin = false;
         evaluatingData.evaluatResultLoading = false;
       }, 200);