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

src/helpers/formateMusic.ts

@@ -887,7 +887,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 	const currentTimes = [] as any[];
 	let isSetNextNoteReal = false;
 	let differFrom = 0;
-	let testIdx = 0;
+	// let testIdx = 0;
 	let repeatIdx = 0; // 循环的次数
 	const firstTrackName = state.canSelectTracks[0] || "";
 	while (!iterator.EndReached) {
@@ -999,9 +999,6 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM
 			});
 		}
-		if (testIdx == 313) {
-			// debugger
-		}
 		iterator.moveToNextVisibleVoiceEntry(false);
 		// 从头开始循环，repeatIdx标记+1
 		if (iterator.backJumpOccurred) {
@@ -1009,7 +1006,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 		}
 		iterator.repeatIdx = repeatIdx;
 		// console.log('小节',testIdx,iterator.repeatIdx,iterator.EndReached,iterator.currentMeasureIndex,iterator.backJumpOccurred,iterator.forwardJumpOccurred)
-		testIdx += 1;
+		// testIdx += 1;
 	}
 	// 是否是变速的曲子
 	const hasVaryingSpeed = _notes.some((item: any) => item.measuresTempoInBPM !== _notes[0].measuresTempoInBPM)
@@ -1245,7 +1242,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 
 			// console.log('si',si,i)
 			// console.log(note.sourceMeasure.MeasureNumberXML,note,svgElement, NoteRealValue, measureLength)
-			if (allNotes.length && allNotes[allNotes.length - 1].relativeTime === relativeTime) {
+			if (allNotes.length && allNotes[allNotes.length - 1].relativeTime === relativeTime && !state.isEvxml) {
 				i++
 				continue;
 			}