Procházet zdrojové kódy

Merge branch 'master' into jenkins

skyblued před 3 roky
rodič
revize
2c12130fff

+ 2 - 2
src/helpers/native-message.ts

@@ -36,7 +36,7 @@ const browserInfo = browser()
 if (browserInfo.isApp) {
 if (browserInfo.isApp) {
   window.addEventListener('message', (evt) => {
   window.addEventListener('message', (evt) => {
     try {
     try {
-      console.log('message', evt.data)
+      console.log('app交互接受:', evt.data)
       const data = evt.data ? (typeof evt.data === 'object' ? evt.data : JSON.parse(evt.data)) : {}
       const data = evt.data ? (typeof evt.data === 'object' ? evt.data : JSON.parse(evt.data)) : {}
       const uuid = data.content?.uuid || data.uuid
       const uuid = data.content?.uuid || data.uuid
       // console.log(uuid, data.content, 'uuid')
       // console.log(uuid, data.content, 'uuid')
@@ -78,7 +78,7 @@ export const postMessage = (data: IPostMessage, callback?: CallBack) => {
     const uuid = getRandomKey()
     const uuid = getRandomKey()
     calls[uuid] = callback || loop
     calls[uuid] = callback || loop
     data.content = data.content ? { ...data.content, uuid } : { uuid }
     data.content = data.content ? { ...data.content, uuid } : { uuid }
-    console.log('app交互发送', data)
+    console.log('app交互发送:', data)
     instance.postMessage(JSON.stringify(data))
     instance.postMessage(JSON.stringify(data))
   }
   }
 }
 }

+ 5 - 4
src/views/coursewarePlay/index.tsx

@@ -164,7 +164,7 @@ export default defineComponent({
               playModel: false,
               playModel: false,
               isprepare: false,
               isprepare: false,
               isDrage: false,
               isDrage: false,
-              muted: (i === 0 && j === 0) ? true : false,
+              muted: false, // 是否静音
             }
             }
           }
           }
           list.push({
           list.push({
@@ -173,7 +173,7 @@ export default defineComponent({
             iframeRef: null,
             iframeRef: null,
             tabName: item.name,
             tabName: item.name,
             isLast: j === itemLength, // 当前知识点
             isLast: j === itemLength, // 当前知识点
-            autoPlay: j === itemLength
+            autoPlay: false, //加载完成是否自动播放
           })
           })
         }
         }
       }
       }
@@ -191,6 +191,8 @@ export default defineComponent({
         popupData.itemActive = item.id
         popupData.itemActive = item.id
         popupData.itemName = item.name
         popupData.itemName = item.name
         popupData.activeIndex = popupData.firstIndex
         popupData.activeIndex = popupData.firstIndex
+        item.autoPlay = true
+        item.muted = true
       }
       }
       console.log('🚀 ~ list', list)
       console.log('🚀 ~ list', list)
       data.itemList = list
       data.itemList = list
@@ -227,7 +229,6 @@ export default defineComponent({
     })
     })
     // 返回
     // 返回
     const goback = () => {
     const goback = () => {
-      console.log('调用goback')
       postMessage({ api: 'goBack' })
       postMessage({ api: 'goBack' })
     }
     }
 
 
@@ -425,7 +426,7 @@ export default defineComponent({
                           data-vid={m.id}
                           data-vid={m.id}
                           src={m.content}
                           src={m.content}
                           loop={m.loop}
                           loop={m.loop}
-                          autoplay={mIndex === 0 ? true : false}
+                          autoplay={m.autoPlay}
                           onLoadedmetadata={(e: Event) => {
                           onLoadedmetadata={(e: Event) => {
                             const videoEle = e.target as unknown as HTMLVideoElement
                             const videoEle = e.target as unknown as HTMLVideoElement
                             m.currentTime = videoEle.currentTime
                             m.currentTime = videoEle.currentTime