热更新1.2.1，解决sdk4.7.6问题

packages/qjkankan-kankan-view/.env.testprod

@@ -0,0 +1,20 @@
+NODE_ENV=production
+# 场景资源地址
+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_STATIC_DIR=viewer
+
+
+# 云存储环境
+VUE_APP_REGION_URL=
+
+# 接口请求地址
+VUE_APP_APIS_URL=https://test.4dkankan.com/

packages/qjkankan-kankan-view/.env.testserve

@@ -0,0 +1,21 @@
+
+# 场景资源地址
+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_STATIC_DIR=viewer
+
+
+# 云存储环境
+VUE_APP_REGION_URL=
+
+# 接口请求地址
+VUE_APP_APIS_URL=https://test.4dkankan.com/
+

packages/qjkankan-kankan-view/package.json

@@ -3,8 +3,9 @@
   "version": "1.2.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --mode testserve",
     "serve-prod": "vue-cli-service serve --mode prod",
+    "build-test-prod": "vue-cli-service build --mode testprod",
     "build": "vue-cli-service build --mode prod",
     "build-eurtestprod": "vue-cli-service build --mode eurtestprod",
     "build-eurprod": "vue-cli-service build --mode eurprod",

packages/qjkankan-kankan-view/public/smg.html

@@ -28,8 +28,8 @@
 
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
         
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.6.2"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.6.2"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.7.6"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.7.6"></script>
 
         <!-- <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk-deps.js?v=4.0.0-alpha.44"></script>
         <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk.js?v=4.0.0-alpha.44"></script> -->

packages/qjkankan-kankan-view/public/spg.html

@@ -17,8 +17,8 @@
         </noscript>
         <div id="app"></div>
         
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.6.2"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.6.2"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.7.6"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.7.6"></script>
 
         <!-- built files will be auto injected -->
     </body>

packages/qjkankan-kankan-view/src/components/Tags/index.vue

@@ -1,7 +1,7 @@
 <template>
     <teleport :to="tags$" v-if="tags$">
         <template v-for="(tag, index) in tags">
-            <div @mouseleave="onMouseLeave($event, tag)" :style="{ left: tag.x + 'px', top: tag.y + 'px' }" :class="{ visible: tag.visible }">
+            <div :tag-sid="tag.sid" @mouseleave="onMouseLeave($event, tag)" :style="{ left: tag.x + 'px', top: tag.y + 'px' }" :class="{ visible: tag.visible }">
                 <span @click.stop="goTag(tag, index)" class="point zoom" @mouseenter.stop="onMouseEnter(tag, index)" :style="{ 'background-image': 'url(' + getUrl(tag.icon) + ')' }"></span>
                 <div class="content">
                     <div class="trans" :class="{ active: (isFixed && hotData && tag.sid == hotData.sid) || (showInfo && hotData && tag.sid == hotData.sid) }">
@@ -95,7 +95,7 @@ const closeTag = async () => {
     const player = await app.TourManager.player
     //关闭热点面板时候，继续播放之前暂停的音频
     if (!app.Scene.isCurrentPanoHasVideo && !player.isPlaying) {
-        if (hotData.value.type == 'audio' || hotData.value.type == 'video') {
+        if ( hotData.value && (hotData.value.type == 'audio' || hotData.value.type == 'video')) {
             // console.log('resume')
             window.parent.postMessage(
             {

packages/qjkankan-kankan-view/src/pages/SMG.vue

@@ -45,7 +45,7 @@ import { useMusicPlayer } from "@/utils/sound";
 import UiTags from "@/components/Tags";
 
 import { listenMessage } from '@/utils/messageHandler'
-
+import {Dialog} from '@/global_components'
 
 import Information from "@/components/Information";
 import Control from "@/components/Controls/Control.Mobile.vue";
@@ -59,6 +59,8 @@ import { ref, onMounted, computed, nextTick, watch } from "vue";
 import { useStore } from "vuex";
 import browser from "@/utils/browser";
 import { useApp, getApp } from "@/app";
+import { useI18n, getLocale } from '@/i18n'
+const { t } = useI18n({ useScope: 'global' })
 
 const musicPlayer = useMusicPlayer();
 
@@ -385,7 +387,7 @@ onMounted(() => {
     });
   });
   app.store.on("floorcad", (floor) => store.commit("scene/loadFloorData", floor));
-
+  app.store.on('flooruser', floor => store.commit('scene/loadFloorData', floor)) //4.7以后新楼层方式
   app.render();
 });
 </script>

packages/qjkankan-kankan-view/src/pages/SPG.vue

@@ -235,6 +235,7 @@ onMounted(() => {
         })
     })
     app.store.on('floorcad', floor => store.commit('scene/loadFloorData', floor))
+    app.store.on('flooruser', floor => store.commit('scene/loadFloorData', floor)) //4.7以后新楼层方式
     app.render()
 })
 </script>

packages/qjkankan-view/.env.testdev

@@ -0,0 +1,8 @@
+VUE_APP_STATIC_DIR=showviewer
+VUE_APP_CDN=https://ossxiaoan.4dage.com
+VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
+VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
+VUE_APP_URL_FILL=
+
+# 接口请求地址
+VUE_APP_APIS_URL=https://test.4dkankan.com/

packages/qjkankan-view/package.json

@@ -3,7 +3,7 @@
   "version": "1.2.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --mode testdev",
     "serve-eurtestdev": "vue-cli-service serve --mode eurtestdev",
     "serve-eurdev": "vue-cli-service serve --mode eurdev",
     "build": "vue-cli-service build",