Procházet zdrojové kódy

Merge branch 'feature-tianyong-newVersion' of http://git.dayaedu.com/liushengqiang/music-score into kt-dev

TIANYONG před 11 měsíci
rodič
revize
159b16b80c
2 změnil soubory, kde provedl 6 přidání a 17 odebrání
  1. 1 1
      instrument.html
  2. 5 16
      src/page-instrument/simple-detail/index.tsx

+ 1 - 1
instrument.html

@@ -24,7 +24,7 @@
   </style>
   <script>
     // VConsole will be exported to `window.VConsole` by default.
-    var vConsole = new window.VConsole();
+    // var vConsole = new window.VConsole();
   </script>
   <script>
     function _postMessage(data, callback) {

+ 5 - 16
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_cloudLoading, simple_musicPage, simple_play, api_suspendPlay } from "/src/helpers/communication";
+import { api_cloudLoading, simple_musicPage } from "/src/helpers/communication";
 
 export default defineComponent({
 	name: "simple-detail",
@@ -22,14 +22,13 @@ export default defineComponent({
 		});
 
 		const communicateCb = (res: any) => {
+			let resInfo: any = {};
 			try {
-                const data = JSON.parse(res.data);
-                console.log('Received data:', data);
+				resInfo = typeof res?.data === 'string' ? JSON.parse(res.data) : res.data;
+                // console.log('Received data:', resInfo);
             } catch (error) {
                 console.error('parse_error: Invalid JSON data received');
             }
-			console.log('h5消息',res)
-			const resInfo = res.data ? res.data : res;
 			// 开始播放
 			if (resInfo?.api === "api_play") {
 				console.log('h5开始播放')
@@ -51,7 +50,7 @@ export default defineComponent({
 			}
 			// 播放进度
 			if (resInfo?.api === "api_playProgress") {
-				console.log('播放进度',res)
+				// console.log('播放进度',resInfo)
 				if (resInfo?.content?.currentTime) {
 					if (resInfo?.content?.currentTime < detailData.currentTime) {
 						state.activeNoteIndex = 0
@@ -73,14 +72,6 @@ export default defineComponent({
 			
 		};
 
-		const simplePlay = (e: any) => {
-			console.log('app开始播放','消息对象',e)
-			state.playState = 'play';
-			setStep();
-		}
-		const suspendPlay = (e: any) => {
-			console.log('app切到后台','消息对象',e)
-		}
 		onMounted(async () => {
 			const id = query.id || '';
 			state.isSimplePage = true;
@@ -88,8 +79,6 @@ export default defineComponent({
 			detailData.isLoading = false;
 			state.isSingleLine = true;
 			window.addEventListener("message", communicateCb);
-			simple_play(simplePlay);
-			api_suspendPlay(suspendPlay);
 		});
 
 		onUnmounted(() => {