dev

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=0512-01
+VUE_APP_DEBBUG_FLAG=0516-01

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=0512-01
+VUE_APP_DEBBUG_FLAG=0516-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=0515-02
+VUE_APP_DEBBUG_FLAG=0516-01

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

@@ -161,7 +161,7 @@ const setExplanation = (from) => {
   ) {
     console.log("设置解说", from);
     let { audioUrl, openByDefault, repeat } = currentScene.value.explanation;
-    showCommentaryPlaying.value = false;
+    // showCommentaryPlaying.value = false;
     store.commit("functions/setCommentaryUrl", {
       src: audioUrl,
       loop: repeat,
@@ -169,13 +169,15 @@ const setExplanation = (from) => {
     });
     useSoundPlayer.player.isLock = false;
     useSoundPlayer.player.watchPlay();
-  } 
+  }
 };
-const stopExplanation = () => {
+const stopExplanation = (from) => {
+  console.log("stop解说", from);
   useSoundPlayer.player.isLock = true;
   soundPlayer.paused();
 };
 const resumeExplanation = () => {
+  console.log("resume解说");
   useSoundPlayer.player.isLock = false;
   useSoundPlayer.player.watchPlay();
 };
@@ -183,13 +185,17 @@ 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]) {
+  if (unref(val[0]) && unref(val[1])) {
     resumeExplanation(2);
   }
+  if (unref(val[0]) && !unref(val[1])) {
+    stopExplanation(2);
+  }
 });
+
 watchEffect(() => {
   if (currentScene.value.explanation) {
     let { audioUrl } = currentScene.value.explanation;
@@ -197,17 +203,16 @@ watchEffect(() => {
     if (audioUrl) {
       //解说有变，初始化按钮状态
       setExplanation(1);
+      if (unref(isShowCover)) {
+        stopExplanation(1);
+      }
     } else {
       resetExplanation(1);
     }
   } else {
     resetExplanation(2);
   }
-  if (unref(isShowCover)) {
-    stopExplanation();
-  }
 });
-
 const showIntroduce = computed(() => store.getters["functions/showIntroduce"]);
 const showTelephone = computed(() => store.getters["functions/showTelephone"]);
 const showLink = computed(() => store.getters["functions/showLink"]);

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

@@ -55,7 +55,6 @@ const stopExplanation = (from) => {
   console.log("stop解说", from);
   useSoundPlayer.player.isLock = true;
   soundPlayer.paused();
-  setTimeout(() => soundPlayer.paused(), 100);
 };
 const resumeExplanation = () => {
   console.log("resume解说");
@@ -69,10 +68,10 @@ const resetExplanation = (from) => {
   soundPlayer.paused();
 };
 watch([isShowCover, isDoneforCover], (val) => {
-  if (val[0] && val[1]) {
+  if (unref(val[0]) && unref(val[1])) {
     resumeExplanation(2);
   }
-  if (val[0] && !val[1]) {
+  if (unref(val[0]) && !unref(val[1])) {
     stopExplanation(2);
   }
 });

packages/qjkankan-view/src/pages/showMobile.js

@@ -20,7 +20,8 @@ if (
   browser.detectWeixin() ||
   browser.detectWeixinMiniProgram() ||
   browser.detectAlipay() ||
-  browser.detectTT()
+  browser.detectTT() ||
+  browser.detectTcTravel()
 ) {
   App = ShowMobile;
 } else {

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

@@ -336,6 +336,12 @@ var browser = {
             .includes("toutiaomicroapp");
     },
 
+    detectTcTravel: function () {
+        return window.navigator.userAgent
+            .toLowerCase()
+            .includes("tctravel");
+    },
+
     detectApp: function () {
         return this.urlHasValue('app')
     },

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

@@ -110,7 +110,7 @@ class AudioPlayer extends QJKanKan.MITT.Emiter {
     }
     paused() {
         console.log('hard-paused')
-        this.sound && this.sound.mute(true)
+        // this.sound && this.sound.mute(true)
         this.sound && this.sound.pause()
         this.isPlay = false
     }