Merge branch 'feature-patch' into ktyq-test-new

src/helpers/formateMusic.ts

@@ -698,6 +698,7 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 	if (state.originSpeed === 0) {
 		state.originSpeed = speeds[0] ? speeds[0] : 100;
 		state.speed = state.originSpeed;
+		// console.log('速度',6,state.speed)
 	}
 	// 赋值谱面速度节拍器，没有的时候 以后台传入的为准
 	const metronomeXml = xmlParse.getElementsByTagName('metronome')?.[0]

src/page-instrument/evaluat-model/index.tsx

@@ -498,6 +498,7 @@ export default defineComponent({
       if (!state.sectionStatus && state.section.length === 0) {
         state.activeNoteIndex = 0;
         state.speed = state.times[0].measureSpeed * state.basePlayRate
+        // console.log('速度',7,state.speed)
       }
       initSetPlayRate();
       // 检测APP端socket状态

src/page-instrument/header-top/speed/index.tsx

@@ -14,7 +14,7 @@ import { handleLoadBeatMusic } from "/src/view/audio-list"
 export default defineComponent({
 	name: "speed",
 	setup() {
-		const speed = ref(state.speed);
+		const speed = ref(Math.floor(state.speed));
 		const switchLoading = ref(false);
 		const query: any = getQuery();
 		const minusSpeed = () => {
@@ -37,6 +37,7 @@ export default defineComponent({
 			() => {
 				// handleSetSpeed(speed.value);
 				state.speed = speed.value
+				// console.log('速度',8,state.speed)
 				// handleSetSpeed(speed.value);
 				if (state.playState === 'paused') {
 					// const currentItem: any = (state.sectionStatus && state.section.length === 2) ? state.sectionFirst || state.section[0] : state.times[state.activeNoteIndex];
@@ -50,6 +51,7 @@ export default defineComponent({
 			() => state.speed,
 			() => {
 				if (speed.value !== state.speed) {
+					// console.log('设置速度',state.speed,speed.value)
 					speed.value = state.speed;
 				}
 			}

src/page-instrument/view-detail/index.tsx

@@ -230,6 +230,7 @@ export default defineComponent({
       // 没有设置速度使用读取的速度
       if (state.originSpeed === 0) {
         state.originSpeed = state.speed = (osmd as any).bpm || osmd.Sheet.userStartTempoInBPM || 100;
+        // console.log('速度',9,state.speed)
       }
       // const saveSpeed = (store.get("speeds") || {})[state.examSongId] || state.speed || (osmd as any).bpm || osmd.Sheet.userStartTempoInBPM;
       // // 加载本地缓存的速度

src/page-instrument/view-evaluat-report/index.tsx

@@ -143,6 +143,7 @@ export default defineComponent({
       state.parentCategoriesId = data.musicTag;
       state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
       state.originSpeed = state.speed = data.speed;
+      // console.log('速度',10,state.speed)
       state.track = data.track;
       state.enableNotation = data.notation ? true : false;
 

src/state.ts

@@ -466,6 +466,7 @@ const dynamicShowPlaySpeed = (index: number) => {
       const newSpeed = state.basePlayRate * item.measureSpeed
       if (state.speed !== newSpeed) {
         state.speed = newSpeed;
+        // console.log('速度',1,state.speed)
       }
     }
   //}
@@ -498,6 +499,7 @@ export const resetBaseRate = (idx?: number) => {
   console.log('速度2',currentSpeed)
   state.speed = currentSpeed
   //state.activeNoteIndex = 0
+  // console.log('速度',2,state.speed)
   state.basePlayRate = 1;
 }
 
@@ -593,6 +595,7 @@ export const skipNotePlay = async (itemIndex: number, isStart = false) => {
     // 非选段模式,点击音符，动态设置右下角的速度
     if (item.measureSpeed && state.section.length < 2) {
       state.speed = state.basePlayRate * 10000 * item.measureSpeed / 10000
+      // console.log('速度',3,state.speed)
     }
     setAudioCurrentTime(itemTime, itemIndex);
     // 一行谱，点击音符，或者播放完成，需要跳转音符位置
@@ -947,6 +950,7 @@ export const handleResetPlay = () => {
 export const handleSetSpeed = (speed: number) => {
   // setStorageSpeed(state.examSongId, speed);
   state.speed = speed;
+  // console.log('速度',4,state.speed)
   // 当前的音符
   // const currentItem: any = (state.sectionStatus && state.section.length === 2) ? state.sectionFirst || state.section[0] : state.times[state.activeNoteIndex];
   const currentItem: any = state.times[state.activeNoteIndex];
@@ -1571,6 +1575,7 @@ const setState = (data: any, index: number) => {
   state.originSpeed = state.speed = speedBeatTo({unit: data.speedBeatUnit || "1/4",speed: parseFloat(data.playSpeed) || 0}, `1/4`);
   // state.originSpeed = state.speed = data.playSpeed;
   // state.playIngSpeed = data.playSpeed;
+  // console.log('速度',5,state.speed)
   const track = data.code || data.track;
   state.track = track ? track.replace(/ /g, "").toLocaleLowerCase() : "";
   // 能否评测，根据当前声轨有无伴奏判断

vite.config.ts

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