update

packages/qjkankan-editor/.env.testprod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0428-01
+VUE_APP_DEBBUG_FLAG=0504-01

packages/qjkankan-editor/src/core/utils.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import { convertJQHotspot } from './hotspot'
+
 let vue = new Vue()
 
 export default class Utils {
@@ -65,7 +66,8 @@ export default class Utils {
       const hotspot = convertJQHotspot(param);
       const hotspotStyle = Object.values(hotspot.style);
       const hotspotString = hotspotStyle.join('|');
-      const hotspotSize = (Number(hotspot.size) || 1) * 50;
+
+      const hotspotSize = (Number(hotspot.size) || 1) * 40;
       let icon = hotspot.icon.replace(/,/g, '|');
       const callString = `editJQHotspot(
         ${hotspot.id},
@@ -102,7 +104,7 @@ export default class Utils {
       const hotspot = convertJQHotspot(param);
       const hotspotStyle = Object.values(hotspot.style);
       const hotspotString = hotspotStyle.join('|');
-      const hotspotSize = (Number(hotspot.size) || 1) * 50;
+      const hotspotSize = (Number(hotspot.size) || 1) * 40;
       const ath = hotspot.ath != '' ? hotspot.ath : krpano.get("curscreen_ath");
       const atv = hotspot.atv != '' ? hotspot.atv : krpano.get("curscreen_atv");
       let icon = hotspot.icon.replace(/,/g, '|');
@@ -122,17 +124,6 @@ export default class Utils {
     } catch (error) {
       console.error('error', error);
     }
-
-    // 设置热点图片默认的偏移值
-    // let offset = '-130%'
-    // if (param.size < 1) {
-    //   offset = '-200%'
-    // }
-    // if (param.size > 1) {
-    //   offset = '-100%'
-    // }
-    // krpano.set('layer[tooltip_' + param.name + '].y', `${offset}`)
-
   }
 
   /**

packages/qjkankan-editor/src/framework/EditorHead.vue

@@ -215,18 +215,21 @@ export default {
 
         switch (item.hotspotType) {
           case "image":
-            fodderId = target.image.reduce((p, c) => p.concat(c["id"]), []);
+            fodderId = target.image
+              .reduce((p, c) => p.concat(c["id"]), [])
+              .map((i) => i);
             target.fodderId = fodderId;
             break;
           case "audio":
-            target.fodderId = [target.audio.id];
+            target.fodderId = [target.audio.id].map((i) => i);
             break;
           case "imageText":
             fodderId = target.imageTextInfo.imageList.reduce(
               (p, c) => p.concat(c["id"]),
               []
-            );
-            fodderId.push(target.imageTextInfo.audio.id);
+            ).map((i) => i);
+            target.imageTextInfo.audio.id &&
+              fodderId.push(target.imageTextInfo.audio.id);
             target.fodderId = fodderId;
             break;
           case "video":

packages/qjkankan-editor/src/lang/_en.json

@@ -597,12 +597,12 @@
     "audio_fail": "Format error. Support MP3 files: ≤ 20MB",
     "upload_material": "Upload materials",
     "new_folder": "New Folder",
-    "new_folder_placeholder": "Please enter a folder name up to 50 characters in length",
+    "new_folder_placeholder": "Please enter a folder name up to 15 characters in length",
     "folder_name_already_used": "Folder already exists",
     "move_folder": "Move",
     "move_folder_to": "Move to",
     "no_folder_need_create": "Please create a folder first",
-    "rename_folder_placeholder": "Please enter a folder name up to 50 characters in length",
+    "rename_folder_placeholder": "Please enter a folder name up to 15 characters in length",
     "video_size": "Support MP4 files: ≤ 200MB",
     "video_limit": "The file is too large.Support MP4 files: ≤ 200MB",
     "video_fail": "Format error. Support MP4 files: ≤ 200MB",

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

@@ -84,7 +84,7 @@ Vue.prototype.$msg.error = (string)=>{
   });
 }
 
-Vue.prototype.$videoImg = "?x-oss-process=video/snapshot,t_0,f_jpg,w_100,m_fast,ar_auto";
+Vue.prototype.$videoImg = "?x-oss-process=video/snapshot,t_0,f_jpg,w_1000,m_fast,ar_auto";
 
 Vue.prototype.$videoImgOriginalSize = "?x-oss-process=video/snapshot,t_0,f_jpg,m_fast,ar_auto";
 

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=0428-01
+VUE_APP_DEBBUG_FLAG=0504-01

packages/qjkankan-view/public/showviewer/lib/krpano/tooltip.xml

@@ -197,7 +197,7 @@
             set_label_pos(get(tooltipname),get(pos));
          ); -->
           if(hoverstatus == 0,
-            delayedcall(0.1,
+            delayedcall(0.2,
             txtadd(tooltipname, 'tooltip_', get(name)); 
             set_label_pos(get(tooltipname),get(pos));
             );
@@ -209,7 +209,7 @@
         if(hoverstatus == 2,
             <!-- trace('测试'); -->
            set(layer[get(tooltipname)].visible,false);
-            delayedcall(0.1,
+            delayedcall(0.2,
              txtadd(tooltipname, 'tooltip_', get(name)); 
                 set_label_pos(get(tooltipname),get(pos));
                 set(layer[get(tooltipname)].visible,false);
@@ -375,6 +375,7 @@
 
     <action name='set_label_pos'>
         <!-- label方位 -->
+       showlog();
        set(posName,%1);
        set(pos,%2);
        copy(hp,posName);
@@ -382,10 +383,11 @@
 
        copy(hwidth, hotspot[get(hp)].width);
        copy(hheight, hotspot[get(hp)].height);
-   
+       trace('hwidth::',get(hwidth));
        copy(lwidth, layer[get(posName)].width);
        copy(lheight, layer[get(posName)].height);
-   
+       trace('lwidth::',get(hwidth));
+       trace('lheight::',get(lheight));
         if(
             pos == 'top',
             add(all,lheight,hheight);

packages/qjkankan-view/src/components/assembly/Tags/metas/metas-imagetext.vue

@@ -279,7 +279,7 @@ watchEffect(() => {
     width: 100%;
     height: 550px;
     // max-width: 1920px;
-    max-width: 1564px;
+    // max-width: 1564px;
     display: flex;
     background: rgba(0, 0, 0, 0.8);
     .image-left {
@@ -304,7 +304,7 @@ watchEffect(() => {
       }
     }
   }
-   .title{
+  .title {
     position: absolute;
     left: 20px;
     top: 20px;
@@ -513,4 +513,14 @@ watchEffect(() => {
     #000000 100%
   );
 }
+@media only screen and (max-width: 1440px) {
+  .imagetxtcon .main-text-container {
+    max-width: 1060px;
+  }
+}
+@media only screen and (min-width: 1440px) {
+  .imagetxtcon .main-text-container {
+    max-width: 1564px;
+  }
+}
 </style>

packages/qjkankan-view/src/sdk/QJKanKan/modules/Tags.js

@@ -1,5 +1,6 @@
 import Emiter from "@/sdk/utils/Emiter";
 import { convertJQHotspot } from './hotspot'
+import browser from "@/utils/browser";
 export default class Tags extends Emiter {
   constructor(app) {
     super();
@@ -12,7 +13,7 @@ export default class Tags extends Emiter {
  */
 
   linkopen(sceneCode, id, hid) {
-    this.emit('clickHotspot', { sceneCode, id})
+    this.emit('clickHotspot', { sceneCode, id })
   }
 
 
@@ -62,7 +63,15 @@ export default class Tags extends Emiter {
       // debugger;
       const hotspotStyle = Object.values(hotspot.style);
       const hotspotString = hotspotStyle.join('|');
-      const hotspotSize = (Number(hotspot.size) || 1) * 50;
+      let hotspotSize
+      if (browser.isMobile()) {
+        hotspotSize = (Number(hotspot.size) || 1) * 30;
+        console.log(`当前${hotspot.id}基础热点大小`, 30);
+      } else {
+        hotspotSize = (Number(hotspot.size) || 1) * 40;
+        console.log(`当前${hotspot.id}基础热点大小`, 40);
+      }
+
       const ath = hotspot.ath != '' ? hotspot.ath : this.app.krpanoDom.get("curscreen_ath");
       const atv = hotspot.atv != '' ? hotspot.atv : this.app.krpanoDom.get("curscreen_atv");
       let icon = hotspot.icon.replace(/,/g, '|');