瀏覽代碼

fix: #9910 bug修复

TIANYONG 1 年之前
父節點
當前提交
a0c34805ff

+ 5 - 1
src/helpers/metronome.ts

@@ -24,6 +24,8 @@ const audioData = reactive({
 	tock: null as unknown as HTMLAudioElement,
 });
 
+let tickTockPlayTime = 0;
+
 export const metronomeData = reactive({
 	disable: true,
 	initPlayerState: false,
@@ -167,6 +169,7 @@ class Metronome {
 			// console.log("播放", metronomeData.activeIndex);
 			metronomeData.activeMetro = this.getStep(activeMetro);
 			// console.log("🚀 ~ metronomeData.activeMetro",metronomeData.activeMetro.measureNumberIndex, metronomeData.activeMetro.index)
+			tickTockPlayTime = currentTime
 			this.playAudio();
 			metronomeData.isClick = false;
 			return;
@@ -188,6 +191,7 @@ class Metronome {
 		} else {
 			this.source.muted = false
 		}
+		// console.log('节拍器播放的时间',tickTockPlayTime)
 		this.source.play();
 	};
 
@@ -351,7 +355,7 @@ class Metronome {
 		} catch (error) {
 			console.log(error);
 		}
-		// console.log(metroList, metroMeasure);
+		console.log('节拍器',metroList, metroMeasure);
 		// 5.得到所有的节拍时间
 		metronomeData.metroList = metroList;
 		metronomeData.metroMeasure = metroMeasure;

+ 2 - 1
src/page-instrument/custom-plugins/guide-page/student-top.tsx

@@ -6,6 +6,7 @@ import { getImage } from "./images";
 import { useRoute } from "vue-router";
 import { getQuery } from "/src/utils/queryString";
 import { getGuidance, setGuidance } from "./api";
+import { headTopData } from "/src/page-instrument/header-top/index";
 
 export default defineComponent({
   name: "studnetT-guide",
@@ -191,7 +192,7 @@ export default defineComponent({
     if (guideInfo.value && guideInfo.value.studnetT || !query.showGuide) {
       tipShow.value = false;
     } else {
-      tipShow.value = true;
+      tipShow.value = headTopData.modeType !== "init" ? true : false;
     }
     }catch(e){
     console.log(e)

+ 3 - 1
src/page-instrument/custom-plugins/guide-page/teacher-bootom.tsx

@@ -5,6 +5,8 @@ import styles from "./index.module.less";
 import { getImage } from "./images";
 import { getQuery } from "/src/utils/queryString";
 import {getGuidance,setGuidance} from './api'
+import { headTopData } from "/src/page-instrument/header-top/index";
+
 export default defineComponent({
 	name: "aiTeacher-guide",
 	emits: ["close"],
@@ -119,7 +121,7 @@ export default defineComponent({
 			if (guideInfo.value && guideInfo.value.teacherBottom || !query.showGuide) {
 			  tipShow.value = false;
 			} else {
-			  tipShow.value = true;
+			  tipShow.value = headTopData.modeType === "init" ? true : false;
 			}
 		  }catch(e){
 			console.log(e)

+ 4 - 0
src/page-instrument/view-detail/index.module.less

@@ -134,6 +134,10 @@
 
 
 .preViewDetail {
+    background: #fff !important;
+    .headHeight {
+        background: #fff !important;
+    }
     .container {
         height: 100%;
         padding-bottom: 0 !important;

+ 7 - 0
src/state.ts

@@ -682,6 +682,13 @@ export const gotoCustomNote = (index: number) => {
 };
 const setCursorPosition = (note: any, cursor: any) => {
   if (state.musicRenderType === EnumMusicRenderType.firstTone || state.musicRenderType === EnumMusicRenderType.fixedTone) {
+    /**
+     * bug:#9920
+     * 简谱选段模式,预备小节为休止小节时,选段播放结束,指针会重置到第一小节位置的初始位置
+     */
+    if (state.sectionStatus && note.isRestFlag) {
+      return
+    }
     nextTick(() => {
       let bbox = note.bbox;
       if (!bbox) {

+ 2 - 2
vite.config.ts

@@ -68,9 +68,9 @@ export default defineConfig({
 				// target: "https://kt.colexiu.com",
 				// target: "https://test.lexiaoya.cn",
 				// target: "https://dev.kt.colexiu.com",
-				target: "https://test.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
+				// target: "https://test.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
 				// target: "https://dev.resource.colexiu.com",
-				// target: "https://test.kt.colexiu.com",
+				target: "https://test.kt.colexiu.com",
 				// target: "https://mec.colexiu.com",
 				changeOrigin: true,
 				rewrite: (path) => path.replace(/^\/instrument/, ""),