소스 검색

fix: #8704 bug修复

TIANYONG 1 년 전
부모
커밋
8ce1ee6ced
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      src/pages/detail/state.ts
  2. 2 2
      src/subpages/colexiu-report/index.tsx
  3. 2 2
      src/subpages/colexiu/uses/use-app.ts

+ 2 - 2
src/pages/detail/state.ts

@@ -90,8 +90,8 @@ const state = reactive({
   isHideEvaluatReportSaveBtn: false,    
 })
 
-export const isRhythmicExercises = () => {
-  const examSongName = state?.activeDetail?.examSongName || ''
+export const isRhythmicExercises = (musicName?: string) => {
+  const examSongName = musicName ? musicName : state?.activeDetail?.musicSheetName || ''
   // console.log("🚀 ~ examSongName:", examSongName,state)
   return examSongName.indexOf('节奏练习') > -1
 }

+ 2 - 2
src/subpages/colexiu-report/index.tsx

@@ -12,7 +12,7 @@ import {
   getParentNote,
 } from '/src/pages/detail/helpers'
 import SettingState from '/src/pages/detail/setting-state'
-import detailState from '/src/pages/detail/state'
+import detailState, { isRhythmicExercises } from '/src/pages/detail/state'
 import { useOriginSearch } from '../colexiu/uses'
 import styles from '../colexiu/index.module.less'
 import detailStyles from './index.module.less'
@@ -72,7 +72,7 @@ const useDetail = (id: number | string): [Ref<ShaeetStatusType>, Ref<MusicSheelD
       const res = await request.get(`/musicSheet/detail/${record.value?.musicalNotesPlayStats.examSongId}`)
       data.value = res.data
       detailState.partIndex = recordRes.data.partIndex || 0
-      detailState.isPercussion = res.data?.background?.[detailState.partIndex]?.musicSubject == 1
+      detailState.isPercussion = res.data?.background?.[detailState.partIndex]?.musicSubject == 1 || isRhythmicExercises(res.data?.musicSheetName);
       status.value = 'success'
     } catch (error) {
       status.value = 'error'

+ 2 - 2
src/subpages/colexiu/uses/use-app.ts

@@ -4,7 +4,7 @@ import request from '/src/helpers/request'
 import originRequest from 'umi-request'
 import store from 'store'
 import runtime, * as RuntimeUtils from '/src/pages/detail/runtime'
-import detailState, { GradualTimes } from '/src/pages/detail/state'
+import detailState, { GradualTimes, isRhythmicExercises } from '/src/pages/detail/state'
 import SettingState from '/src/pages/detail/setting-state'
 import { listenerMessage, postMessage } from '/src/helpers/native-message'
 import audiosInstance from '/src/helpers/multiple-audio'
@@ -76,7 +76,6 @@ export const useMp3s = async (detail: MusicSheelDetail) => {
     music: musicSong ? musicSong + '?t=music' : '',
   }
   detailState.isAppPlay = detail.audioType === 'MIDI'
-  detailState.isPercussion = musicInfo.musicSubject == '1'
   let defaultExtConfigJson = {
     skipTick: false,
     repeatedBeats: false,
@@ -92,6 +91,7 @@ export const useMp3s = async (detail: MusicSheelDetail) => {
       ...defaultExtConfigJson,
     },
   }
+  detailState.isPercussion = musicInfo.musicSubject == '1' || isRhythmicExercises();
   try {
     extConfigJson = JSON.parse(detail?.extConfigJson || '')
   } catch (error) {}