Ver Fonte

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

TIANYONG há 11 meses atrás
pai
commit
2ad9614008
2 ficheiros alterados com 17 adições e 5 exclusões
  1. 3 2
      instrument.html
  2. 14 3
      src/page-instrument/simple-detail/index.tsx

+ 3 - 2
instrument.html

@@ -33,7 +33,8 @@
         instance.postMessage(JSON.stringify(data))
       }
     }
-    if (!location.href.includes('iscurseplay=play') && !location.href.includes('isPreView=true')) {
+    // APP的全屏loading动画
+    if (!location.href.includes('iscurseplay=play') && !location.href.includes('isPreView=true') && !location.href.includes("simple-detail")) {
       _postMessage({
         api: 'cloudLoading',
         content: {
@@ -50,7 +51,7 @@
   <img id="loading" class="show" src="/loading.svg" alt="loading" />
   <script>
     // 处理课堂乐器老师端打开听音练习时去掉加载动画
-    if (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('platform=pc') >= 0 && location.href.indexOf('linkSource=class') < 0) {
+    if (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('platform=pc') >= 0 && location.href.indexOf('linkSource=class') < 0 && !location.href.includes("simple-detail")) {
       var _loading = document.getElementById("loading");
       _loading && document.body.removeChild(_loading);
     }

+ 14 - 3
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 } from "/src/helpers/communication";
+import { api_cloudLoading, simple_musicPage, simple_play, api_suspendPlay } from "/src/helpers/communication";
 
 export default defineComponent({
 	name: "simple-detail",
@@ -22,6 +22,12 @@ export default defineComponent({
 		});
 
 		const communicateCb = (res: any) => {
+			try {
+                const data = JSON.parse(res.data);
+                console.log('Received data:', data);
+            } catch (error) {
+                console.error('parse_error: Invalid JSON data received');
+            }
 			console.log('h5消息',res)
 			const resInfo = res.data ? res.data : res;
 			// 开始播放
@@ -67,11 +73,14 @@ export default defineComponent({
 			
 		};
 
-		const simplePlay = () => {
-			console.log('app开始播放')
+		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;
@@ -79,6 +88,8 @@ export default defineComponent({
 			detailData.isLoading = false;
 			state.isSingleLine = true;
 			window.addEventListener("message", communicateCb);
+			simple_play(simplePlay);
+			api_suspendPlay(suspendPlay);
 		});
 
 		onUnmounted(() => {