Ver código fonte

feat: 一行谱修改

TIANYONG 11 meses atrás
pai
commit
ce9ef5b6b1
1 arquivos alterados com 10 adições e 9 exclusões
  1. 10 9
      src/page-instrument/simple-detail/index.tsx

+ 10 - 9
src/page-instrument/simple-detail/index.tsx

@@ -8,7 +8,7 @@ import store from "store";
 import { formateTimes } from "../../helpers/formateMusic";
 import { setCustomGradual, setCustomNoteRealValue } from "/src/helpers/customMusicScore"
 import { initSmoothAnimation, smoothAnimationState, destroySmoothAnimation, moveSmoothAnimationByPlayTime } from "../view-detail/smoothAnimation";
-import { api_playProgress, api_cloudLoading, simple_playProgress, simple_remove_playProgress, simple_play, simple_paused, simple_updateProgress, simple_musicPage } from "/src/helpers/communication";
+import { api_cloudLoading, simple_musicPage } from "/src/helpers/communication";
 
 export default defineComponent({
 	name: "simple-detail",
@@ -18,14 +18,14 @@ export default defineComponent({
 		const detailData = reactive({
 			isLoading: true,
 			currentTime: 0, // 当前播放的时间
-			totalTime: 60000, // 音视频总时长
+			totalTime: 0, // 音视频总时长
 		});
 
 		const communicateCb = (res: any) => {
 			// console.log('h5消息',res)
 			// 开始播放
 			if (res?.data?.api === "api_play") {
-				console.log('开始播放')
+				console.log('h5开始播放')
 				state.playState = 'play';
 				setStep();
 			}
@@ -38,22 +38,24 @@ export default defineComponent({
 			if (res?.data?.api === "api_updateProgress") {
 				console.log('拖动的进度')
 				if (state.playState === 'paused') {
-					detailData.currentTime = res?.data?.data ? res?.data?.data : detailData.currentTime;
+					detailData.currentTime = res?.data?.content?.currentTime ? res?.data?.content?.currentTime : detailData.currentTime;
 					handlePlaying();
 				}
 			}
 			// 播放进度
 			if (res?.data?.api === "api_playProgress") {
-				if (res?.data.data) {
-					if (res?.data.data < detailData.currentTime) {
+				// console.log('h5播放进度',res)
+				if (res?.data?.content?.currentTime) {
+					if (res?.data?.content?.currentTime < detailData.currentTime) {
 						state.activeNoteIndex = 0
 					}
-					detailData.currentTime = res?.data.data
+					detailData.currentTime = res?.data?.content?.currentTime
 				}
 			}
 		};
 		// 监听评测曲谱音频播放进度,返回
 		const progress = (res: any) => {
+			console.log('app播放进度',res)
 			const currentTime = res?.currentTime || res?.content?.currentTime;
 			if (currentTime) {
 				if (currentTime < detailData.currentTime) {
@@ -65,6 +67,7 @@ export default defineComponent({
 		};
 
 		const simplePlay = () => {
+			console.log('app开始播放')
 			state.playState = 'play';
 			setStep();
 		}
@@ -74,8 +77,6 @@ export default defineComponent({
 			await getMusicDetail(id, 'open');
 			detailData.isLoading = false;
 			state.isSingleLine = true;
-			simple_playProgress(progress);
-			simple_play(simplePlay);
 			window.addEventListener("message", communicateCb);
 		});