tremble 2 år sedan
förälder
incheckning
7dbaa221bd

+ 3 - 3
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/
 
 
 
@@ -17,5 +17,5 @@ VUE_APP_STATIC_DIR=viewer
 VUE_APP_REGION_URL=
 
 # 接口请求地址
-VUE_APP_APIS_URL=https://test.4dkankan.com/
+VUE_APP_APIS_URL=https://www.4dkankan.com/
 

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

@@ -65,6 +65,26 @@ 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 = () => {
@@ -247,6 +267,7 @@ 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)

+ 13 - 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,7 +13,7 @@
     <!-- :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"
+    <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}`" -->
@@ -86,7 +86,6 @@ const handleMessage = (res) => {
       if (params.music) {
         // console.log(useMusicPlayer.player,'useMusicPlayer.player');
         useMusicPlayer.player.watchPlay(true)
-        console.log(useMusicPlayer.player);
         if (isMobile.value) {
           if (useMusicPlayer.player.isPlay) {
             setTimeout(() => {
@@ -104,7 +103,6 @@ const handleMessage = (res) => {
 
     if (event == "fdkkMetadata") {
       store.commit('fdkk/setMetadata', params.metadata)
-      console.log(params.metadata, 'params.metadata');
     }
 
 
@@ -120,10 +118,20 @@ const handleMessage = (res) => {
         musicPlayer.resume()
       } else {
         musicPlayer.pause(true)
+      }
+    }
 
+    if (event == "autoPlayBgm") {
+      // useMusicPlayer.player.watchPlay(true)
+      if (!useMusicPlayer.player.isPlay && !musicPlayer.pauseFromOther) {
+        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>
 

+ 8 - 0
packages/qjkankan-view/src/components/Pano/index.vue

@@ -20,6 +20,7 @@ const musicPlayer = useMusicPlayer()
 const soundPlayer = useSoundPlayer()
 
 const store = useStore();
+const isMobile = computed(() => browser.isMobile());
 
 const currentScene = computed(() => store.getters["scene/currentScene"]);
 const metadata = computed(() => store.getters["scene/metadata"]);
@@ -55,6 +56,13 @@ watch(currentScene, (newVal, oldVal) => {
     if (store.getters['fdkk/fdkkBGM']) {
       store.commit('fdkk/setFdkkBGM', '')
       useMusicPlayer.player.watchPlay(true)
+      if (isMobile.value) {
+          if (useMusicPlayer.player.isPlay) {
+            setTimeout(() => {
+              musicPlayer.play()
+            }, 50);
+          }
+        }
     }
 
     nextTick(() => {

+ 2 - 2
packages/qjkankan-view/src/components/UIGather/mobile/list.vue

@@ -38,7 +38,7 @@
     <div class="swiper-container" id="swcatalogRoot" :style="`width:${Math.min(catalogRootW, innerW)}px;
     padding:${catalogRootW > innerW ? '0 15px' : '0'}`"
       v-if="metadata.catalogRoot.length > 0 && metadata.catalogs.length > 1">
-      <ul class="swiper-wrapper" v-if="metadata.catalogRoot.length > 1">
+      <ul class="swiper-wrapper" v-show="metadata.catalogRoot.length > 1">
         <li class="swiper-slide" :class="{
           active: currentCatalogRoot.id == item.id,
           loopspan: item.name.length > spanlength && currentCatalogRoot.id == item.id,
@@ -119,7 +119,7 @@ const loadList = () => {
         });
         if (item == '#swScenes') {
           setTimeout(() => {
-            tmp && tmp.slideTo(0, 50, false)
+            tmp && tmp.slideTo(0, 80, false)
           }, 0);
         }