瀏覽代碼

fix: bug修改

TIANYONG 11 月之前
父節點
當前提交
2190bdf7ed

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

@@ -43,6 +43,7 @@ let calculateInfo: any = {};
 let checkErjiTimer: any = null
 let checkErjiTimer: any = null
 
 
 export const reCheckDelay = () => {
 export const reCheckDelay = () => {
+  evaluatingData.needCheckErjiStatus = true;
   headTopData.settingMode = false
   headTopData.settingMode = false
   state.setting.soundEffect = false
   state.setting.soundEffect = false
   api_startDelayCheck({});
   api_startDelayCheck({});

+ 1 - 1
src/page-instrument/header-top/index.tsx

@@ -390,7 +390,7 @@ export default defineComponent({
     /** 播放类型按钮 */
     /** 播放类型按钮 */
     const playTypeBtn = computed(() => {
     const playTypeBtn = computed(() => {
       // 选择模式,跟练模式,评测模式 不显示
       // 选择模式,跟练模式,评测模式 不显示
-      if (headTopData.modeType !== "show" || state.modeType === "follow" || state.modeType === "evaluating") return { display: false, disabled: false };
+      if (headTopData.modeType !== "show" || state.modeType === "follow" || state.modeType === "evaluating" || query.workRecord) return { display: false, disabled: false };
       if (!state.isAppPlay) {
       if (!state.isAppPlay) {
         let index = 0;
         let index = 0;
         state.music && index++;
         state.music && index++;

+ 10 - 4
src/view/evaluating/index.tsx

@@ -411,7 +411,11 @@ export const handleStartBegin = async (preTimes?: number) => {
 		evaluatingData.isBeginMask = false
 		evaluatingData.isBeginMask = false
 		onPlay();
 		onPlay();
 	}
 	}
-	if (evaluatingData.isErrorState) return
+	if (evaluatingData.isErrorState) {
+    state.playState = 'paused';
+    evaluatingData.startBegin = false;
+    return
+  }
 	//开始录音
 	//开始录音
 	// await api_startRecording({
 	// await api_startRecording({
 	// 	accompanimentState: state.setting.enableAccompaniment ? 1 : 0,
 	// 	accompanimentState: state.setting.enableAccompaniment ? 1 : 0,
@@ -646,6 +650,8 @@ const handleAccompanyError = (res?: IPostMessage) => {
   console.log("异常信息返回", res);
   console.log("异常信息返回", res);
   if (res?.content) {
   if (res?.content) {
     const { type, reson } = res.content;
     const { type, reson } = res.content;
+    state.playState = 'paused'
+    evaluatingData.startBegin = false
     switch (type) {
     switch (type) {
       case "enterBackground":
       case "enterBackground":
       // App退到后台
       // App退到后台
@@ -731,8 +737,8 @@ export default defineComponent({
     /** 记录状态 */
     /** 记录状态 */
     const hanlde_record = () => {
     const hanlde_record = () => {
       // 取消指法
       // 取消指法
-      record_old_data.finger = state.setting.displayFingering;
-      state.setting.displayFingering = false;
+      // record_old_data.finger = state.setting.displayFingering;
+      // state.setting.displayFingering = false;
       // 切换为伴奏
       // 切换为伴奏
       record_old_data.play_mode = state.playSource;
       record_old_data.play_mode = state.playSource;
       record_old_data.enableAccompaniment = state.setting.enableAccompaniment;
       record_old_data.enableAccompaniment = state.setting.enableAccompaniment;
@@ -745,7 +751,7 @@ export default defineComponent({
     /** 还原状态 */
     /** 还原状态 */
     const handle_reduction = () => {
     const handle_reduction = () => {
       // 还原指法
       // 还原指法
-      state.setting.displayFingering = record_old_data.finger;
+      // state.setting.displayFingering = record_old_data.finger;
       state.playSource = record_old_data.play_mode;
       state.playSource = record_old_data.play_mode;
 
 
       // 如果关闭伴奏, 结束评测取消静音
       // 如果关闭伴奏, 结束评测取消静音

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

@@ -145,7 +145,6 @@ const calcNoteData = () => {
 				MeasureNumberXMLList.push(item.MeasureNumberXML);
 				MeasureNumberXMLList.push(item.MeasureNumberXML);
 			} else {
 			} else {
 				if (item.multipleRestMeasures) {
 				if (item.multipleRestMeasures) {
-					console.log(111111)
 					if (state.isCombineRender) {
 					if (state.isCombineRender) {
 						state.vfmeasures.forEach((item: any, idx: number) => {
 						state.vfmeasures.forEach((item: any, idx: number) => {
 							const measureNum = item.getAttribute('data-num') ? Number(item.getAttribute('data-num')) : -1;
 							const measureNum = item.getAttribute('data-num') ? Number(item.getAttribute('data-num')) : -1;