新增离线包配置判断

packages/qjkankan-view/src/apis/index.js

@@ -35,7 +35,6 @@ export function getPanoInfo(ok, no) {
  */
 export function getFdkkInfo(data, ok, no) {
   // 使用环境变量判断是否为离线模式
-  console.log(data, 'config.isOfflineMode')
   if (config.isOfflineMode) {
     // 离线包环境，读取本地JSON文件
     return new Promise((resolve, reject) => {
@@ -45,12 +44,9 @@ export function getFdkkInfo(data, ok, no) {
       let sceneJsonPath = ''
       if(data.currentScene.version && data.currentScene.version == 'V4') {
         sceneJsonPath = `/scene_view_data/${vrId}/data/scene.json`;
-        console.log(1)
       } else { 
-        console.log(2)
         sceneJsonPath = `/data/data${vrId}/scene.json`
       }
-      console.log(sceneJsonPath, 'sceneJsonPath')
       fetch(sceneJsonPath)
         .then(response => response.json())
         .then(data => {

packages/qjkankan-view/src/components/Fdkk/index.vue

@@ -79,13 +79,32 @@ const V4IframeUrl = computed(() => {
   const v4Mi = process.env.VUE_APP_DEBBUG_V4_URL;
 
   if (process.env.VUE_APP_DEBBUG_V4 == 1) {
-    return `${v4Mi}/${unref(isMobile) ? "smg" : "spc"}.html?m=${
-      unref(currentScene).sceneCode
-    }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    // 这里需要做离线包特殊处理
+    if(config.isOfflineMode) {
+      console.log("unref(currentScene)", unref(currentScene));
+      let version = unref(currentScene).version;
+      console.log("version", version);
+      return `${v4Mi}/${unref(isMobile)? "smg" : version && version == 'V4' ? "spg" : "spc"}.html?m=${
+        unref(currentScene).sceneCode
+      }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    } else {
+      return `${v4Mi}/${unref(isMobile) ? "smg" : "spg"}.html?m=${
+        unref(currentScene).sceneCode
+      }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    }
   } else {
-    return `/${unref(isMobile) ? "smg" : "spc"}.html?m=${
-      unref(currentScene).sceneCode
-    }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    if(config.isOfflineMode) {
+      console.log("unref(currentScene)", unref(currentScene));
+      let version = unref(currentScene).version;
+      console.log("version", version);
+      return `/${unref(isMobile) ? "smg" : version && version == 'V4' ? "spg" : "spc"}.html?m=${
+        unref(currentScene).sceneCode
+      }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    } else {
+      return `/${unref(isMobile) ? "smg" : "spg"}.html?m=${
+        unref(currentScene).sceneCode
+      }&fromApp=panorama&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
+    }
   }
 });
 

packages/qjkankan-view/src/components/Pano/index.vue

@@ -145,17 +145,32 @@ watch(
         // console.log(newVal, "newVal");
       });
     } else {
-      console.log("currentScene", currentScene.value, currentScene.value.version);
       getFdkkInfo({ num: newVal.sceneCode, currentScene: currentScene.value }).then(async (data) => {
         hadGetInfo.value = true;
 
-        const isVersion = isUpgradeAdapter(data.data.isUpgrade);
+        let isVersion = 0;
+        if(config.isOfflineMode){
+          if(unref(currentScene).version && unref(currentScene).version == 'V4'){
+            isVersion = isUpgradeAdapter(data.isUpgrade);
+          } else {
+            isVersion = isUpgradeAdapter((data && data.isUpgrade) ? data.data.isUpgrade : 0);
+          }
+        } else {
+          isVersion = isUpgradeAdapter((data.data && data.data.isUpgrade) ? data.data.isUpgrade : 0);
+        }
         console.log("当前-version", isVersion);
         store.dispatch("audio/setLock", true);
         store.commit("scene/setFdkkCurrentVersion", isVersion);
         // v3
         if (isVersion === "V3") {
-          let flag = data.data.bgMusic && data.data.bgMusic != "0" && data.data.bgMusic != "Cheerful" && data.data.bgMusic != "noMusic";
+          let flag = ""
+          // 离线包模式，接口返回的是data，没有嵌套.data
+          if(config.isOfflineMode){
+            flag = data.bgMusic && data.bgMusic != "0" && data.bgMusic != "Cheerful" && data.bgMusic != "noMusic";
+          } else {
+            flag = data.data.bgMusic && data.data.bgMusic != "0" && data.data.bgMusic != "Cheerful" && data.data.bgMusic != "noMusic";
+          }
+          
 
           console.error("是否有V3--BGM", flag);
           store.commit("fdkk/setV3FdkkBGM", flag);