save 1.3.2

packages/qjkankan-editor/.env.prod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
 VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0510-02
+VUE_APP_DEBBUG_FLAG=0512-01

packages/qjkankan-editor/src/mixins/debuggerHelper.js

@@ -5,7 +5,7 @@ export const debuggerHelper = (show = true) => {
         // log.setColors({
         var css = "background: #28b561; color:#fff;font-size:14px;padding:5px;";
 
-        console.log(`%c 👉:当前版本::---> 1.3.1--${process.env.VUE_APP_DEBBUG_FLAG}`,css);
+        console.log(`%c 👉:当前版本::---> 1.3.2--${process.env.VUE_APP_DEBBUG_FLAG}`,css);
 
     }
 

packages/qjkankan-view/.env.prod

@@ -7,4 +7,4 @@ VUE_APP_URL_FILL=/qjkankan
 
 # 接口请求地址
 VUE_APP_APIS_URL=https://www.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=0510-02
+VUE_APP_DEBBUG_FLAG=0512-01

packages/qjkankan-view/.env.testprod

@@ -6,4 +6,4 @@ VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
 # 接口请求地址
 VUE_APP_APIS_URL=https://test.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=0511-02
+VUE_APP_DEBBUG_FLAG=0512-033

packages/qjkankan-view/public/showMobile.html

@@ -23,9 +23,9 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/howler/howler.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper-bundle.min.js"></script>
     <!-- <script src="<%= VUE_APP_STATIC_DIR %>/lib/jssor/jssor.slider-28.1.0.min.js"></script> -->
-    <!-- <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
+    <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
     <script>
       var vConsole = new window.VConsole()
-  </script> -->
+  </script>
   </body>
 </html>

packages/qjkankan-view/src/components/UIGather/control.vue

@@ -154,11 +154,12 @@ const customLink = computed(() => store.getters["scene/customLink"]);
 const fdkkmetadata = computed(() => store.getters["fdkk/metadata"]);
 const fdkkBGM = computed(() => store.getters["fdkk/fdkkBGM"]);
 
-const setExplanation = () => {
+const setExplanation = (from) => {
   if (
     "explanation" in currentScene.value &&
     "audioUrl" in currentScene.value.explanation
   ) {
+    console.log("设置解说", from);
     let { audioUrl, openByDefault, repeat } = currentScene.value.explanation;
     showCommentaryPlaying.value = false;
     store.commit("functions/setCommentaryUrl", {
@@ -168,30 +169,42 @@ const setExplanation = () => {
     });
     useSoundPlayer.player.isLock = false;
     useSoundPlayer.player.watchPlay();
-  }
+  } 
+};
+const stopExplanation = () => {
+  useSoundPlayer.player.isLock = true;
+  soundPlayer.paused();
 };
-const resetExplanation = () => {
+const resumeExplanation = () => {
+  useSoundPlayer.player.isLock = false;
+  useSoundPlayer.player.watchPlay();
+};
+const resetExplanation = (from) => {
+  console.log("清空解说", from);
   store.commit("functions/setCommentaryUrl", "");
   useSoundPlayer.player.isLock = true;
   soundPlayer.pause();
 };
 watch([isShowCover, isDoneforCover], (val) => {
   if (val[0] && val[1]) {
-    setExplanation();
+    resumeExplanation(2);
   }
 });
 watchEffect(() => {
   if (currentScene.value.explanation) {
     let { audioUrl } = currentScene.value.explanation;
 
-    if (audioUrl && !unref(isShowCover)) {
+    if (audioUrl) {
       //解说有变，初始化按钮状态
-      setExplanation();
+      setExplanation(1);
     } else {
-      resetExplanation();
+      resetExplanation(1);
     }
   } else {
-    resetExplanation();
+    resetExplanation(2);
+  }
+  if (unref(isShowCover)) {
+    stopExplanation();
   }
 });
 

packages/qjkankan-view/src/components/UIGather/mobile/control.vue

@@ -34,42 +34,64 @@ const isShowCover = computed(
   () => metadata.value.coverInfo?.isShowCover || false
 );
 
-const setExplanation = () => {
+const setExplanation = (from) => {
   if (
     "explanation" in currentScene.value &&
     "audioUrl" in currentScene.value.explanation
   ) {
+    console.log("设置解说", from);
     let { audioUrl, openByDefault, repeat } = currentScene.value.explanation;
+    // showCommentaryPlaying.value = false;
     store.commit("functions/setCommentaryUrl", {
       src: audioUrl,
       loop: repeat,
       openByDefault: openByDefault,
     });
-
     useSoundPlayer.player.isLock = false;
     useSoundPlayer.player.watchPlay();
   }
 };
-const resetExplanation = () => {
+const stopExplanation = (from) => {
+  console.log("stop解说", from);
+  useSoundPlayer.player.isLock = true;
+  soundPlayer.paused();
+  setTimeout(() => soundPlayer.paused(), 100);
+};
+const resumeExplanation = () => {
+  console.log("resume解说");
+  useSoundPlayer.player.isLock = false;
+  useSoundPlayer.player.watchPlay();
+};
+const resetExplanation = (from) => {
+  console.log("清空解说", from);
   store.commit("functions/setCommentaryUrl", "");
   useSoundPlayer.player.isLock = true;
-  soundPlayer.pause();
+  soundPlayer.paused();
 };
 watch([isShowCover, isDoneforCover], (val) => {
   if (val[0] && val[1]) {
-    setExplanation();
+    resumeExplanation(2);
+  }
+  if (val[0] && !val[1]) {
+    stopExplanation(2);
   }
 });
+
 watchEffect(() => {
   if (currentScene.value.explanation) {
     let { audioUrl } = currentScene.value.explanation;
-    if (audioUrl && !unref(isShowCover)) {
-      setExplanation();
+
+    if (audioUrl) {
+      //解说有变，初始化按钮状态
+      setExplanation(1);
+      if (unref(isShowCover)) {
+        stopExplanation(1);
+      }
     } else {
-      resetExplanation();
+      resetExplanation(1);
     }
   } else {
-    resetExplanation();
+    resetExplanation(2);
   }
 });
 </script>

packages/qjkankan-view/src/utils/debuggerHelper.js

@@ -5,7 +5,7 @@ export const debuggerHelper = (show = true) => {
         // log.setColors({
         var css = "background: #28b561; color:#fff;font-size:14px;padding:5px;";
 
-        console.log(`%c 👉:当前版本::---> 1.3.1--${process.env.VUE_APP_DEBBUG_FLAG}`,css);
+        console.log(`%c 👉:当前版本::---> 1.3.2--${process.env.VUE_APP_DEBBUG_FLAG}`,css);
 
     }
 

packages/qjkankan-view/src/utils/sound.js

@@ -19,7 +19,7 @@ const retryPlay = player => {
         $player.removeEventListener('touchstart', onclick)
 
         //判断是否第一次进入或者是否已点击过
-        if (player.pauseFromOther||CLICKFIRST) {
+        if (player.pauseFromOther || CLICKFIRST) {
             return
         }
         CLICKFIRST = true
@@ -102,11 +102,17 @@ class AudioPlayer extends QJKanKan.MITT.Emiter {
         if (!this.isPlay) {
             return
         }
+
         this.sound.pause()
         if (fromOther) {
             this.pauseFromOther = true
         }
     }
+    paused() {
+        console.log('hard-paused')
+        this.sound && this.sound.pause()
+        this.isPlay = false
+    }
     stop() {
         this.sound.stop()
     }
@@ -137,7 +143,7 @@ class MusicPlayer extends AudioPlayer {
                             if (!player.pauseFromOther) {
                                 this.play()
                             }
-                        } catch (error) {}
+                        } catch (error) { }
 
                     },
                     false
@@ -178,15 +184,15 @@ class MusicPlayer extends AudioPlayer {
                         //         parent.document.addEventListener('WeixinJSBridgeReady', ready)
                         //     }
                         // } else {
-                            if (autoplay) {
-                                setTimeout(() => {
-                                    this.play()
-                                }, 50);
-                            }
-                            else {
-                                retryPlay(this)
-                            }
-                            // ready()
+                        if (autoplay) {
+                            setTimeout(() => {
+                                this.play()
+                            }, 50);
+                        }
+                        else {
+                            retryPlay(this)
+                        }
+                        // ready()
                         // }
 
                     })