Browse Source

默认开启节拍器

黄琪勇 6 months ago
parent
commit
44be32a938

+ 1 - 1
src/page-instrument/component/the-music-list/index.tsx

@@ -8,7 +8,7 @@ import { evaluatingData } from "/src/view/evaluating";
 import { getQuery } from "/src/utils/queryString";
 const query: any = getQuery();
 export const isMusicList = computed(()=>{
-	return !(state.isHomeWork || query.modelType || state.platform === IPlatform.PC || query.isCbs)
+	return !(query.isHideMusicList || state.isHomeWork || query.modelType || state.platform === IPlatform.PC || query.isCbs)
 })
 export const musicListShow = ref(false)
 export default defineComponent({

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

@@ -684,14 +684,14 @@ export default defineComponent({
                   }
                   class={[styles.title, state.isCbsView && styles.blackTitle, "headeTopTitleBtn", isPad && styles.isIpad]}
                   onClick={() => {
-                    isMusicList.value && !state.isHomeWork && !query.isHideMusicList && (musicListShow.value = true);
+                    isMusicList.value && (musicListShow.value = true);
                   }}
                 >
-                  {isMusicList.value && !state.isHomeWork && !query.isHideMusicList && <div class={[styles.symbolNote, "driver-8"]}></div>}
+                  {isMusicList.value && <div class={[styles.symbolNote, "driver-8"]}></div>}
                   <NoticeBar text={state.examSongName} background="none" />
                 </div>
               ) : (
-                isMusicList.value && !state.isHomeWork && !query.isHideMusicList && (
+                isMusicList.value && (
                   <img
                     src={listImg}
                     class={[styles.img, styles.listImg, "driver-8"]}

+ 2 - 2
src/state.ts

@@ -1441,8 +1441,8 @@ const getMusicInfo = async (res: any) => {
   state.isScoreRender = res.data?.isScoreRender
   // 是否默认显示总谱
   state.defaultScoreRender = res.data?.defaultScoreRender
-  // 是否显示节拍器
-  state.isMixBeat = res.data?.isMixBeat
+  // 是否显示节拍器  (管乐迷 默认显示节拍器)
+  //state.isMixBeat = res.data?.isMixBeat  
   /* 设置partIndex */
   let partIndexs = query["part-index"] ? query["part-index"].split(",") : ["-1"] // -1为partIndex没有值的时候
   partIndexs = partIndexs.map((indexStr:string) => {

+ 4 - 1
src/view/audio-list/index.tsx

@@ -341,11 +341,14 @@ export default defineComponent({
 		// 合成节拍器资源
 		async function mergeBeatAudio(){
 			let beatMusic, beatAccompany
+			if(!state.isMixBeat) {
+				return [beatMusic, beatAccompany]
+			}
 			console.time("音频合成时间")
 			try{
 				const crunker = new Crunker()
 				console.time("音频加载时间")
-				const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(state.music?`${state.music}?v=${Date.now()}`:null, state.accompany?`${state.accompany}?v=${Date.now()}`:null, tickMp3, tockMp3)
+				const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(state.music?`${state.music}?v=${Date.now()}`:undefined, state.accompany?`${state.accompany}?v=${Date.now()}`:undefined, tickMp3, tockMp3)
 				console.timeEnd("音频加载时间")
 				// 计算音频空白时间
 				const silenceDuration = musicBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(musicBuff) : 0