修改hots

gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -123,8 +123,6 @@ public class SceneController extends BaseController {
             sceneService.update(entity);
         }
 
-
-
         return Result.success();
     }
 
@@ -250,9 +248,19 @@ public class SceneController extends BaseController {
 
             // 更新someDataJson
             someDataJson.put("model", model);
-            someDataJson.put("loadlogo", infoJson.get("loadlogo"));
-            someDataJson.put("supportsVR", infoJson.getBoolean("supportsVR"));
-            someDataJson.put("backgroundMusic", infoJson.getString("backgroundMusic"));
+
+            // info信息除camera_start、hoticon, 其他字段都加到someDataJson最外层
+            Set<String> infoKey = infoJson.keySet();
+            for (String key : infoKey) {
+//                if ("hoticon".equals(key) || "camera_start".equals(key)) {
+//                    continue;
+//                }
+                someDataJson.put(key, infoJson.get(key));
+            }
+
+//            someDataJson.put("loadlogo", infoJson.get("loadlogo"));
+//            someDataJson.put("supportsVR", infoJson.getBoolean("supportsVR"));
+//            someDataJson.put("backgroundMusic", infoJson.getString("backgroundMusic"));
 
             // 删除旧someDataJson
             FileUtil.del(someDataPath);
@@ -286,7 +294,7 @@ public class SceneController extends BaseController {
         String data2 = FileUtil.readUtf8String(data2Path);
         JSONObject data2Json = JSONObject.parseObject(data2);
 
-        log.info("old data2Json: " + data2Json.toJSONString());
+//        log.info("old data2Json: " + data2Json.toJSONString());
 
         String tourAudio = param.getTourAudio();
         if (tourAudio != null) {
@@ -350,7 +358,7 @@ public class SceneController extends BaseController {
             data2Json.put("audio", audioJson);
         }
 
-        log.info("new datajs: " + data2Json.toJSONString());
+//        log.info("new datajs: " + data2Json.toJSONString());
 
 
         // 删除旧data2.js