فهرست منبع

增加场景版本枚举
修改根据vision.txt获取全景图名称列表

dsx 2 سال پیش
والد
کامیت
8865f3ad70

+ 39 - 0
4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/SceneVersionType.java

@@ -0,0 +1,39 @@
+package com.fdkankan.common.constant;
+
+/**
+ * 操作类型枚举
+ */
+public enum SceneVersionType {
+
+    V3("V3", "V3"),
+    V4("V4", "V4");
+
+    private String code;
+    private String message;
+
+    private SceneVersionType(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public static SceneVersionType get(String code){
+        SceneVersionType[] values = SceneVersionType.values();
+        String enumValue = null;
+        for(SceneVersionType eachValue : values){
+            enumValue = eachValue.code();
+            if(enumValue.equals(code)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
+}

+ 1 - 2
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

@@ -689,8 +689,7 @@ public class CreateObjUtil {
 	}
 
 	public static void main(String[] args) throws Exception {
-		CreateObjUtil.convertTxtToVisionmodeldata("F:\\test2\\vision(1).txt", "F:\\test2\\vision1.modeldata");
-		CreateObjUtil.convertTxtToVisionmodeldata("F:\\test2\\vision2.txt", "F:\\test2\\vision2.modeldata");
+		CreateObjUtil.convertTxtToVisionmodeldata("D:\\test\\test\\vision.txt", "D:\\test\\test\\vision.modeldata");
 
 
 	}

+ 3 - 4
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/SceneUtil.java

@@ -41,12 +41,11 @@ public class SceneUtil {
 
     /**
      * 根据vision.txt获取全景图名称列表
-     * @param visionPath
+     * @param visionJson
      * @return
      */
-    public static List<String> getPanoramaImageList(String visionPath){
-        String visionTxt = FileUtil.readString(visionPath, Charset.forName("UTF-8"));
-        JSONObject visionObject = JSON.parseObject(visionTxt);
+    public static List<String> getPanoramaImageList(String visionJson){
+        JSONObject visionObject = JSON.parseObject(visionJson);
         JSONArray sweepLocations = visionObject.getJSONArray("sweepLocations");
         List<String> imageList = sweepLocations.parallelStream().map(o -> {
             JSONObject item = (JSONObject) o;