Merge branch 'dev' into release

.env

@@ -10,6 +10,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
+VUE_APP_LASER_RESOURCE_URL=https://laser-oss.4dkankan.com/
 VUE_APP_TEST=0
 #ico 地址
 VUE_APP_ICO=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico

.env.jp

@@ -10,6 +10,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
+VUE_APP_LASER_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=0
 #环境区分
 VUE_APP_ENV=jp

.env.test-jp

@@ -10,6 +10,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
+VUE_APP_LASER_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=1
 #环境区分
 VUE_APP_ENV=jp

src/locales/en.json

@@ -130,7 +130,8 @@
     "4003": "The user does not exist",
     "3014": "The account number or password is incorrect.",
     "3015": "The user does not exist",
-    "4013": "The current scene is not detected under this account, please change your account and log in again."
+    "4013": "The current scene is not detected under this account, please change your account and log in again.",
+    "4014": "Your current account is not authenticated, please authenticate it before logging in."
   },
   "code.name": "code"
 }

src/locales/ja.json

@@ -130,7 +130,8 @@
     "4003": "ユーザーが存在しません",
     "3014": "アカウント番号またはパスワードが正しくありません",
     "3015": "ユーザーが存在しません",
-    "4013": "このアカウントで現在のシーンが検出されません。アカウントを変更して再度ログインしてください。"
+    "4013": "このアカウントで現在のシーンが検出されません。アカウントを変更して再度ログインしてください。",
+    "4014": "現在のアカウントは認証されていませんので、認証してからログインしてください。"
   },
   "code.name": "状態コード"
 }

src/locales/zh.json

@@ -130,7 +130,8 @@
     "4003": "用户不存在",
     "3014": "账号或密码不正确。",
     "3015": "用户不存在。",
-    "4013": "该账号下未检测到当前场景，请更换账号重新登录"
+    "4013": "该账号下未检测到当前场景，请更换账号重新登录",
+    "4014": "当前登录账号未授权，请先授权后再登录"
   },
   "code.name": "状态码"
 }

src/pages/SViewer.vue

@@ -94,7 +94,7 @@ const sourceURL = computed(() => {
     if (source.value.type < 2) {
         return `smart-kankan.html?m=${source.value.num}`
     } else {
-        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath  =${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 

src/pages/Viewer.vue

@@ -230,7 +230,9 @@ const sourceURL = computed(() => {
     } else {
         getLaserInfo(source.value.num)
         // 深时场景
-        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+            process.env.VUE_APP_RESOURCE_URL
+        }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 const noPanorama = ref(true)
@@ -266,7 +268,9 @@ const targetURL = computed(() => {
         return `smart-kankan.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}`
     } else {
         // 深时场景
-        return `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+            process.env.VUE_APP_RESOURCE_URL
+        }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 const sourceDate = computed(() => {

src/utils/ConvertViews.js

@@ -865,6 +865,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
                 isAtPano : images360.isAtPano(),
                 quaternionChanged : true,
                 bumping: images360.bumping,
+                isFlyToPano: !!images360.latestToPano
                 
             } 
         }else if(app.sceneType == 'kankan'){
@@ -899,7 +900,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
         convertInfo = convertInfo || this.convertInfo
         if(fakeApp.sceneType == 'laser'){
             //customer.Potree.settings.displayMode = fakeApp.viewInfo.displayMode
-            if(fakeApp.viewInfo.isAtPano || fakeApp.viewInfo.bumping || fakeApp.viewInfo.displayMode == 'showPanos'){ //不改变漫游点，仅转换朝向 
+            if(fakeApp.viewInfo.isAtPano || fakeApp.viewInfo.bumping || fakeApp.viewInfo.isFlyToPano || fakeApp.viewInfo.displayMode == 'showPanos'){ //不改变漫游点，仅转换朝向 
                 if( fakeApp.viewInfo.quaternionChanged){
                     let diffQua = customer.fakeApp == convertInfo.targetFakeApp ? convertInfo.diffQua : convertInfo.diffQuaInvert
                     //let diffQua = customer == this.targetApp ? convertInfo.diffQua : convertInfo.diffQuaInvert
@@ -936,7 +937,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
         
     }
      
-    laserSyncView(app,data){
+    laserSyncView(app,data){ 
         app.viewer.mainViewport.view.position.copy(data.position)
         app.viewer.mainViewport.view.lookAt(data.target)
     }
@@ -1149,8 +1150,13 @@ note:
 还不支持laser和4dkk同屏
 
 访问：
-window[0]   window[1]
-window[0].fakeApp, window[1].fakeApp
+ 
+window.global__.sourceApp.fakeApp
+window.global__.targetApp.fakeApp
+ window[1] 不准确，不一定是targetApp
+
+
+
 
 旋转只能通过target设置, 不能直接改camera.quaternion
 当且仅当发送方相机属性变化后才传递过来，就不在这里判断是否变化了。