dsx před 2 roky
rodič
revize
358c474531

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

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