浏览代码

update 1122

tremble 2 年之前
父节点
当前提交
b911150b9d

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/EditPanel.vue

@@ -137,7 +137,7 @@ export default {
       hotSpotTypeList: [
         {
           id: 'scene',
-          name: this.$i18n.t('hotspot.scene')
+          name: this.$i18n.t('hotspot.secne')
         },
         {
           id: 'link',

+ 2 - 2
packages/qjkankan-kankan-view/.env.development

@@ -4,8 +4,8 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
+# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/
 
 
 

+ 23 - 0
packages/qjkankan-kankan-view/src/pages/SMG.vue

@@ -64,6 +64,27 @@ const musicPlayer = useMusicPlayer();
 
 let app = null;
 
+const autoPlayMedia = player => {
+    function onclick() {
+        window.parent.postMessage(
+            {
+                source: "qjkankan",
+                event: "autoPlayBgm",
+                params: {
+                    status: true,
+                },
+            },
+            "*"
+        );
+        $player.removeEventListener('click', onclick)
+        $player.removeEventListener('touchstart', onclick)
+    }
+    const $player = document.querySelector('.player')
+    $player.addEventListener('click', onclick)
+    $player.addEventListener('touchstart', onclick)
+}
+
+
 listenMessage()
 
 const closetagtype = () => {
@@ -246,6 +267,8 @@ onMounted(() => {
       },
       "*"
     );
+    autoPlayMedia()
+
   });
   app.Scene.on("panorama.videorenderer.resumerender", () => {
     window.parent.postMessage(

+ 21 - 0
packages/qjkankan-kankan-view/src/pages/SPG.vue

@@ -37,6 +37,26 @@ const { t } = useI18n({ useScope: 'global' })
 
 
 
+const autoPlayMedia = player => {
+    function onclick() {
+        window.parent.postMessage(
+            {
+                source: "qjkankan",
+                event: "autoPlayBgm",
+                params: {
+                    status: true,
+                },
+            },
+            "*"
+        );
+        $player.removeEventListener('click', onclick)
+        $player.removeEventListener('touchstart', onclick)
+    }
+    const $player = document.querySelector('.player')
+    $player.addEventListener('click', onclick)
+    $player.addEventListener('touchstart', onclick)
+}
+
 const store = useStore()
 const show = ref(false)
 const scene$ = ref(null)
@@ -95,6 +115,7 @@ onMounted(() => {
             },
             "*"
         );
+        autoPlayMedia()
     })
     app.store.on('tags', tags => {
         store.commit('tag/load', tags)

+ 15 - 5
packages/qjkankan-view/src/components/Fdkk/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="fdkkcon">
     <template v-if="fdkkCurrentVersion == 'v3'">
-      <iframe :key="currentScene.sceneCode" v-if="!isMobile" id="fdkkifr" :src="`/spc.html?m=${currentScene.sceneCode}`"
-        frameborder="0"></iframe>
+      <iframe allowfullscreen="true" allow="autoplay" :key="currentScene.sceneCode" v-if="!isMobile" id="fdkkifr"
+        :src="`/spc.html?m=${currentScene.sceneCode}`" frameborder="0"></iframe>
       <!-- <iframe :key="currentScene.sceneCode" v-if="!isMobile" id="fdkkifr" :src="`https://test.4dkankan.com/spc.html?m=${currentScene.sceneCode}`" -->
 
       <!-- v3场景移动端,用embed.html定制开发 -->
@@ -13,9 +13,8 @@
     <!-- :url="otherLink ? otherLink : `https://test.4dkankan.com/embed.html?from=mingyuan&m=${embeM || currentScene.sceneCode}&lang=zh&scene-link=1&rnd=${rnd}`" /> -->
 
 
-    <iframe :key="currentScene.sceneCode" v-else id="fdkkifr"
-      :src="`${isMobile ? 'smg' : 'spg'}.html?m=${currentScene.sceneCode}`"
-      frameborder="0"></iframe>
+    <iframe allowfullscreen="true" allow="autoplay" :key="currentScene.sceneCode" v-else id="fdkkifr"
+      :src="`${isMobile ? 'smg' : 'spg'}.html?m=${currentScene.sceneCode}`" frameborder="0"></iframe>
     <!-- :src="`http://192.168.20.66:8080/${isMobile ? 'smg' : 'spg'}.html?m=${currentScene.sceneCode}`" -->
 
 
@@ -124,6 +123,17 @@ const handleMessage = (res) => {
       }
     }
 
+    if (event == "autoPlayBgm") {
+      // useMusicPlayer.player.watchPlay(true)
+      if (!useMusicPlayer.player.isPlay) {
+        musicPlayer.pauseFromOther = true
+        setTimeout(() => {
+          musicPlayer.play()
+        }, 50);
+      }
+    }
+
+
   }
 }
 

+ 1 - 1
packages/qjkankan-view/src/components/Fdkk/v3fdkkmobile/iframe.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ifrcon">
     <vvheader :somedatainfo="somedatainfo" :bgmstatus="bgmstatus" :params="params" class="hhh" />
-    <iframe allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
+    <iframe allow="autoplay" allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
   </div>
 </template>