修改提交分辨率更新

common-lib/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java

@@ -174,7 +174,7 @@ public class DeviceReq implements Serializable {
 
         //double radio=1920/1080;
 
-        System.out.println(NumberUtil.div(1920, 1080, 2));
+        System.out.println(NumberUtil.div(1280, 952, 2));
         System.out.println(NumberUtil.div(1080, 1920, 2));
         System.out.println(NumberUtil.div(400, 1280, 2));
         System.out.println(NumberUtil.div(1024, 600, 2));

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -590,7 +590,7 @@ public class DeviceApiController {
                 if (!ObjectUtils.isEmpty(width) && !ObjectUtils.isEmpty(height)) {
                     //根据分辨率 自适应设置分辨率
                     double div = NumberUtil.div(Double.parseDouble(width), Double.parseDouble(height), 2);
-                    if (div >= 1.3 && div <= 5.0) {
+                    if (div >= 1.4 && div <= 5.0) {
                         deviceEntity.setResolutionValue(ImageReEnum.RE_1920X1080.getDesc());
                         deviceEntity.setResolution(ImageReEnum.RE_1920X1080.getDesc());
                         log.info("1.3 < div < 5.0");
@@ -600,7 +600,7 @@ public class DeviceApiController {
                         deviceEntity.setResolution(ImageReEnum.RE_1080X1920.getDesc());
                         log.info("0.1 < div < 0.79");
                         //System.out.println("1.7 < div < 1.8");
-                    } else if (div >= 0.8 && div <= 1.29) {
+                    } else if (div >= 0.8 && div <= 1.39) {
                         deviceEntity.setResolutionValue(ImageReEnum.RE_1280X1280.getDesc());
                         deviceEntity.setResolution(ImageReEnum.RE_1280X1280.getDesc());
                         log.info("div >= 0.9 && div <= 1.1");