浏览代码

feat: midi播放修改

TIANYONG 1 周之前
父节点
当前提交
97c9378241

+ 2 - 1
src/helpers/formateMusic.ts

@@ -1467,7 +1467,8 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				trackIndex: note.trackIndex, // 当前的音符属于第几条分轨
 				isStaccato: note.voiceEntry.isStaccato(),
 				isRestFlag: note.isRestFlag,
-				noteId: note.NoteToGraphicalNoteObjectId || `restNote${note.sourceMeasure.MeasureNumberXML}`,
+				// noteId: note.NoteToGraphicalNoteObjectId || `restNote${note.sourceMeasure.MeasureNumberXML}`,
+				noteId: note.NoteToGraphicalNoteObjectId === undefined ? `restNote${note.sourceMeasure.MeasureNumberXML}` : note.NoteToGraphicalNoteObjectId,
 				measureListIndex: note.sourceMeasure.measureListIndex,
 				MeasureNumberXML: note.sourceMeasure.MeasureNumberXML, // 当前的小节数,(从1开始)
 				_noteLength: _noteLength,

+ 1 - 1
src/page-instrument/header-top/index.module.less

@@ -346,7 +346,7 @@
 
 .disabled {
     pointer-events: none;
-    opacity: .5;
+    opacity: .5 !important;
 }
 
 .playBtn {

+ 5 - 1
src/state.ts

@@ -1444,7 +1444,7 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
     state.partListNames = tracks
   }
   // 当没有任何曲目的时候报错
-  if (!musicObj?.audioFileUrl && !accompanyObj?.audioFileUrl && !fanSongObj?.audioFileUrl && !banSongObj?.audioFileUrl && !fanSongObj?.solmizationFileUrl && !fanSongObj?.femaleSolmizationFileUrl) {
+  if (!musicObj?.audioFileUrl && !accompanyObj?.audioFileUrl && !fanSongObj?.audioFileUrl && !banSongObj?.audioFileUrl && !fanSongObj?.solmizationFileUrl && !fanSongObj?.femaleSolmizationFileUrl && data.playMode !== 'MIDI') {
     state.noMusicSource = true // 没有音源文件
     // 独奏的时候
     if(musicSheetType === "SINGLE"){
@@ -1609,6 +1609,10 @@ const setState = (data: any, index: number) => {
   state.isShowFingering = data.isShowFingering ? true : false;
   // 设置曲谱的播放模式, APP播放(midi音频是app播放) | h5播放
   state.isAppPlay = data.playMode === 'MIDI';
+  if (state.isAppPlay) {
+    state.isOpenMetronome = false
+    state.isSingOpenMetronome = false
+  }
   state.midiUrl = data.midiFileUrl;
   state.parentCategoriesId = data.musicTag;
   state.musicSheetCategoriesId = data.musicCategoryId;

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

@@ -395,7 +395,7 @@ export async function changeCombineAudio (combineIndex: string){
 		// 当开启节拍器的时候,切为伴奏的时候合成节拍器1
 		await handleLoadBeatMusic()
 		// 当没有背景音文件的时候
-		if(!state.accompany && !state.fanSong && !state.banSong) {
+		if(!state.accompany && !state.fanSong && !state.banSong && !state.isAppPlay) {
 			state.noMusicSource = true
 		}
 		//设置进度

+ 1 - 1
src/view/selection/index.module.less

@@ -85,7 +85,7 @@
     position: absolute;
     right: 10px;
     top: -45px;
-    transform: translateX(-50%);
+    // transform: translateX(-50%);
     font-size: 18px;
     font-family: "Roboto", sans-serif;
     font-weight: bold;