Browse Source

feat: 选段、切谱面,速度不重置

TIANYONG 4 months ago
parent
commit
fcd0f5854e
4 changed files with 9 additions and 8 deletions
  1. 1 1
      osmd-extended
  2. 5 4
      src/state.ts
  3. 1 1
      src/view/music-score/index.tsx
  4. 2 2
      src/view/selection/index.tsx

+ 1 - 1
osmd-extended

@@ -1 +1 @@
-Subproject commit 727729315b605fcb615570b822952decbbf63a08
+Subproject commit 647c6d5387e5d379740089499eaa32643e0d802f

+ 5 - 4
src/state.ts

@@ -1012,7 +1012,7 @@ export const handleChangeSection = () => {
     togglePlay("paused");
     clearSelection();
     // 重置速度和播放倍率
-    resetBaseRate(state.activeNoteIndex);
+    // resetBaseRate(state.activeNoteIndex);
     //skipNotePlay(0, true);  取消选段的时候 不跳回开头
     state.sectionFirst = null;
     // IOS18.1.1浏览器渲染更新有问题,需要手动更新一下
@@ -1168,7 +1168,7 @@ export const hanldeDirectSelection = (list: any[]) => {
     // 选段完成后,需要根据预报小节的速度,设置右下角显示的速度
     const currentItem: any = (state.sectionStatus && state.section.length === 2) ? state.sectionFirst || state.section[0] : state.times[state.activeNoteIndex];
     if (currentItem.measureSpeed && query.workRecord === undefined && query.evaluatingRecord === undefined) {
-      handleSetSpeed(currentItem.measureSpeed);
+      // handleSetSpeed(currentItem.measureSpeed);
     }
     console.log('选段小节', state.section)
   }, 0);
@@ -1233,7 +1233,7 @@ export const handleRessetState = () => {
   state.noSavePopShow = true;
   clearSelection();
   skipNotePlay(0, true);
-  resetBaseRate();
+  // resetBaseRate();
   // midi 重置播放进度
   if (state.isAppPlay) {
     audioData.progress = 0;
@@ -2243,10 +2243,11 @@ export const checkMoveNoSave = async () => {
 /** 刷新谱面 */
 export const refreshMusicSvg = () => {
   (window as any).DYhideTrackTune = false;
+  console.time('加载过程')
   moveData.noteCoords = []
   moveData.modelList = []
   clearSelection();
-  resetBaseRate();
+  // resetBaseRate();
   state.activeMeasureIndex = -1;
   if (query.workRecord || query.evaluatingRecord) {
     state.workSectionNeedReset = true;

+ 1 - 1
src/view/music-score/index.tsx

@@ -255,7 +255,7 @@ export default defineComponent({
 				// 在滚动过程中(雄鹰高飞这种marginbottom比较大的) 多行谱和一行谱切换 滚动高度会出问题
 				container && (container.scrollTop = 0)
 				//setRenderType();
-				state.basePlayRate = 1;
+				// state.basePlayRate = 1;
 				await getXML();
 				await init();
 				musicData.showSelection = true;

+ 2 - 2
src/view/selection/index.tsx

@@ -437,12 +437,12 @@ export default defineComponent({
 										// 如果选择了2个 删除左边的时候
 										if (state.section.length===1&&index === 0) {
 											// #bug:11552
-											resetBaseRate(state.activeNoteIndex);
+											// resetBaseRate(state.activeNoteIndex);
 										}
 										if(state.section.length===2&&index === 0){
 											state.section = []
 											// 重置速度和播放倍率
-											resetBaseRate(state.activeNoteIndex);
+											// resetBaseRate(state.activeNoteIndex);
 											showToast({
 												message: "请选择开始小节",
 												duration: 0,