|
@@ -14,6 +14,7 @@ import cn.hutool.json.JSONUtil;
|
|
|
import com.fdkankan.common.constant.ErrorCode;
|
|
|
import com.fdkankan.common.constant.SceneDownloadProgressStatus;
|
|
|
import com.fdkankan.common.constant.SceneFrom;
|
|
|
+import com.fdkankan.common.constant.SceneKind;
|
|
|
import com.fdkankan.common.constant.SceneResolution;
|
|
|
import com.fdkankan.common.constant.ServerCode;
|
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
@@ -235,14 +236,9 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
|
|
|
String sceneJsonData = fYunFileService.getFileContent(bucket, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "scene.json");
|
|
|
JSONObject sceneJson = JSONUtil.parseObj(sceneJsonData);
|
|
|
- String resolution = "4k";
|
|
|
- String sceneForm = sceneJson.getStr("sceneFrom");
|
|
|
- if(StrUtil.isNotEmpty(sceneForm) && SceneFrom.PRO.code().equals(sceneForm)){
|
|
|
- resolution = "2k";
|
|
|
- }
|
|
|
+ String resolution = sceneJson.getStr("sceneResolution");
|
|
|
//国际版存在已经切好图的情况,下载时不需要再切图,只需要把文件直接下载下来打包就可以了
|
|
|
- String sceneResolution = sceneJson.getStr("sceneResolution");
|
|
|
- if(SceneResolution.TILES.code().equals(sceneResolution)){
|
|
|
+ if(SceneKind.FACE.code().equals(sceneJson.getStr("sceneKind"))){
|
|
|
resolution = "notNeadCut";
|
|
|
}
|
|
|
|