|
@@ -11,6 +11,7 @@ import com.fdkankan.common.bean.DownLoadProgressBean;
|
|
import com.fdkankan.common.bean.DownLoadTaskBean;
|
|
import com.fdkankan.common.bean.DownLoadTaskBean;
|
|
import com.fdkankan.common.constant.SceneDownloadProgressStatus;
|
|
import com.fdkankan.common.constant.SceneDownloadProgressStatus;
|
|
import com.fdkankan.common.constant.SceneFrom;
|
|
import com.fdkankan.common.constant.SceneFrom;
|
|
|
|
+import com.fdkankan.common.constant.SceneResolution;
|
|
import com.fdkankan.common.constant.ServerCode;
|
|
import com.fdkankan.common.constant.ServerCode;
|
|
import com.fdkankan.common.constant.UploadFilePath;
|
|
import com.fdkankan.common.constant.UploadFilePath;
|
|
import com.fdkankan.common.response.ResultData;
|
|
import com.fdkankan.common.response.ResultData;
|
|
@@ -183,6 +184,12 @@ public class SceneDownloadHandlerServiceImpl {
|
|
if(StrUtil.isNotEmpty(sceneForm) && SceneFrom.PRO.code().equals(sceneForm)){
|
|
if(StrUtil.isNotEmpty(sceneForm) && SceneFrom.PRO.code().equals(sceneForm)){
|
|
resolution = "2k";
|
|
resolution = "2k";
|
|
}
|
|
}
|
|
|
|
+ //国际版存在已经切好图的情况,下载时不需要再切图,只需要把文件直接下载下来打包就可以了
|
|
|
|
+ String sceneResolution = sceneJson.getStr("sceneResolution");
|
|
|
|
+ if(SceneResolution.TILES.code().equals(sceneResolution)){
|
|
|
|
+ resolution = "notNeadCut";
|
|
|
|
+ }
|
|
|
|
+
|
|
int imagesVersion = -1;
|
|
int imagesVersion = -1;
|
|
// TODO: 2022/3/29 V4版本目前没有imagesVersion字段,暂时用version字段替代
|
|
// TODO: 2022/3/29 V4版本目前没有imagesVersion字段,暂时用version字段替代
|
|
// if(getInfoJson.getInt("imagesVersion") != null){
|
|
// if(getInfoJson.getInt("imagesVersion") != null){
|
|
@@ -282,10 +289,12 @@ public class SceneDownloadHandlerServiceImpl {
|
|
return;
|
|
return;
|
|
|
|
|
|
//切图
|
|
//切图
|
|
- if((filePath.contains(imageNumPath + "panorama/") && filePath.contains("tiles/" + resolution))
|
|
|
|
- || filePath.contains(imageNumPath + "tiles/" + resolution + "/")) {
|
|
|
|
- this.processImage(filePath, out, resolution, imagesVersion, cacheKeys);
|
|
|
|
- return;
|
|
|
|
|
|
+ if(!"notNeadCut".equals(resolution)){
|
|
|
|
+ if((filePath.contains(imageNumPath + "panorama/") && filePath.contains("tiles/" + resolution))
|
|
|
|
+ || filePath.contains(imageNumPath + "tiles/" + resolution + "/")) {
|
|
|
|
+ this.processImage(filePath, out, resolution, imagesVersion, cacheKeys);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
//其他文件打包
|
|
//其他文件打包
|