tremble 3 лет назад
Родитель
Сommit
8766634dff

+ 0 - 2
public/showMobile.html

@@ -33,8 +33,6 @@
     <!-- built files will be auto injected -->
     <!-- built files will be auto injected -->
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/jquery-2.1.1.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/jquery-2.1.1.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/events.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/howler.min.js"></script>
     <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
     <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 
 
 <!-- 
 <!-- 

+ 29 - 5
src/framework/showMobile/iframe.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="ifrcon">
   <div class="ifrcon">
-    <Header :bgmUrl="tempBgm" :params="params" />
+    <Header :bgmUrl="tempBgm" @toggleBGM="handleBGM" :bgmstatus="bgmstatus" :params="params" />
     <iframe allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
     <iframe allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
   </div>
   </div>
 </template>
 </template>
@@ -14,7 +14,8 @@ export default {
   components:{Header},
   components:{Header},
   data(){
   data(){
     return {
     return {
-      params:''
+      params:'',
+      bgmstatus: false
     }
     }
   },
   },
   computed:{
   computed:{
@@ -39,7 +40,6 @@ export default {
             ||e.data.params.url.indexOf('https://test.4dkankan.com/spc.html?')>-1
             ||e.data.params.url.indexOf('https://test.4dkankan.com/spc.html?')>-1
             ||e.data.params.url.indexOf('https://test.4dkankan.com/smobile.html?')>-1) {
             ||e.data.params.url.indexOf('https://test.4dkankan.com/smobile.html?')>-1) {
               let m = browser.urlHasValueFromUrl('m',e.data.params.url)
               let m = browser.urlHasValueFromUrl('m',e.data.params.url)
-              console.log(m);
               this.$emit('changeUrl',m)
               this.$emit('changeUrl',m)
             } else{
             } else{
               this.$emit('otherUrl',e.data.params.url)
               this.$emit('otherUrl',e.data.params.url)
@@ -47,11 +47,17 @@ export default {
 
 
         }
         }
 
 
-        // if (e.data.event == "guide-status") {
-        // }
+
+
 
 
         if (e.data.event == "action") {
         if (e.data.event == "action") {
           this.$bus.emit('currentMode',e.data.params)
           this.$bus.emit('currentMode',e.data.params)
+          
+          if (e.data.params.type == "playMusic") {
+            console.log(e.data.params.data.status,'e.data');
+            this.bgmstatus = e.data.params.data.status
+            
+          }
         }
         }
 
 
         if (e.data.event == "loaded") {
         if (e.data.event == "loaded") {
@@ -60,9 +66,27 @@ export default {
               source: "mingyuan",
               source: "mingyuan",
               event: 'guide-rooms'
               event: 'guide-rooms'
           },"*")
           },"*")
+
+          this.$refs.iframe.contentWindow.postMessage({
+              source : "mingyuan",
+              event:"settings",
+              params:{
+                  playMusic:true
+              }
+          },"*")
         }
         }
 
 
       }
       }
+    },
+    handleBGM(status){
+
+       this.$refs.iframe.contentWindow.postMessage({
+            source : "mingyuan",
+            event:"settings",
+            params:{
+                playMusic:status
+            }
+        },"*")
     }
     }
   }
   }
 }
 }

+ 0 - 3
src/framework/showMobile/index.vue

@@ -88,7 +88,6 @@ import { mapGetters } from "vuex";
 import vAudio from "@/components/audio";
 import vAudio from "@/components/audio";
 
 
 import list from "./list";
 import list from "./list";
-import { backgroundMusicPlayer } from "../../utils/sounds";
 
 
 let __krfn = krfn.default;
 let __krfn = krfn.default;
 
 
@@ -387,10 +386,8 @@ export default {
             removepano("#pano");
             removepano("#pano");
             $("#pano").empty();
             $("#pano").empty();
             this.getSceneInfomation();
             this.getSceneInfomation();
-
             return;
             return;
           } else {
           } else {
-            backgroundMusicPlayer.remove();
             this.bgmUrl = "";
             this.bgmUrl = "";
           }
           }
           removepano("#pano");
           removepano("#pano");

+ 11 - 18
src/framework/showMobile/ui/Show.Header.vue

@@ -113,17 +113,16 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { backgroundMusicPlayer } from "../../../utils/sounds";
 
 
 export default {
 export default {
-  props: [ "description", "params", "bgmUrl"],
+  props: [ "description", "params", "bgmUrl","bgmstatus"],
   data() {
   data() {
     return {
     return {
       showDescription: false,
       showDescription: false,
       showMore: false,
       showMore: false,
       shareURL: "",
       shareURL: "",
       isVR: false,
       isVR: false,
-      isMusicPlaying: false,
+      isMusicPlaying: this.bgmstatus,
     };
     };
   },
   },
 
 
@@ -131,11 +130,7 @@ export default {
     onMenuClick(name) {
     onMenuClick(name) {
       this.$nextTick(() => {
       this.$nextTick(() => {
         if (name == "music") {
         if (name == "music") {
-          if (this.isMusicPlaying) {
-            backgroundMusicPlayer.pause();
-          } else {
-            backgroundMusicPlayer.play();
-          }
+          this.isMusicPlaying = !this.isMusicPlaying
         }
         }
       });
       });
     },
     },
@@ -172,21 +167,19 @@ export default {
   watch: {
   watch: {
     bgmUrl(newVal) {
     bgmUrl(newVal) {
       if (newVal) {
       if (newVal) {
-        console.log(newVal,'newVal');
-        backgroundMusicPlayer.setSRC(newVal);
-        backgroundMusicPlayer.play();
+        this.isMusicPlaying = true
       }
       }
     },
     },
+    isMusicPlaying(newVal){
+      this.$emit('toggleBGM',newVal)
+    },
+    bgmstatus(newVal){
+      this.isMusicPlaying = newVal
+    }
   },
   },
 
 
   mounted() {
   mounted() {
-    backgroundMusicPlayer.on("play", () => {
-      this.isMusicPlaying = true;
-    });
-
-    backgroundMusicPlayer.on("off", () => {
-      this.isMusicPlaying = false;
-    });
+   
   },
   },
 };
 };
 </script>
 </script>