附件拍摄焦距:Double -> Integer

main
朱黄耀 2 years ago
parent daf865b400
commit 27516a156d
  1. BIN
      app/src/main/assets/landcloud_demo.db
  2. 10
      app/src/main/java/cn/org/landcloud/survey/data/DataRepositories.java
  3. 6
      app/src/main/java/cn/org/landcloud/survey/data/bean/FJ.java

@ -185,7 +185,7 @@ public class DataRepositories {
fj_phone_normal.setPSFYJ(19); fj_phone_normal.setPSFYJ(19);
fj_phone_normal.setPSJD(239); fj_phone_normal.setPSJD(239);
fj_phone_normal.setPSHGJ(0); fj_phone_normal.setPSHGJ(0);
fj_phone_normal.setPSJJ(27d); fj_phone_normal.setPSJJ(27);
fj_phone_normal.setXDGD(1.50d); fj_phone_normal.setXDGD(1.50d);
fj_phone_normal.setFJYSKD(1920); fj_phone_normal.setFJYSKD(1920);
fj_phone_normal.setFJYSGD(1080); fj_phone_normal.setFJYSGD(1080);
@ -243,7 +243,7 @@ public class DataRepositories {
fj_phone_panoramic.setPSFYJ(26); fj_phone_panoramic.setPSFYJ(26);
fj_phone_panoramic.setPSJD(22); fj_phone_panoramic.setPSJD(22);
fj_phone_panoramic.setPSHGJ(-88); fj_phone_panoramic.setPSHGJ(-88);
fj_phone_panoramic.setPSJJ(27d); fj_phone_panoramic.setPSJJ(27);
fj_phone_panoramic.setXDGD(1.50d); fj_phone_panoramic.setXDGD(1.50d);
fj_phone_panoramic.setFJYSKD(4096); fj_phone_panoramic.setFJYSKD(4096);
fj_phone_panoramic.setFJYSGD(2048); fj_phone_panoramic.setFJYSGD(2048);
@ -293,7 +293,7 @@ public class DataRepositories {
fj_uav_normal.setPSFYJ(-60); fj_uav_normal.setPSFYJ(-60);
fj_uav_normal.setPSJD(337); fj_uav_normal.setPSJD(337);
fj_uav_normal.setPSHGJ(0); fj_uav_normal.setPSHGJ(0);
fj_uav_normal.setPSJJ(24d); fj_uav_normal.setPSJJ(24);
fj_uav_normal.setXDGD(111.00d); fj_uav_normal.setXDGD(111.00d);
fj_uav_normal.setFJYSKD(4000); fj_uav_normal.setFJYSKD(4000);
fj_uav_normal.setFJYSGD(2250); fj_uav_normal.setFJYSGD(2250);
@ -344,7 +344,7 @@ public class DataRepositories {
fj_uav_panoramic.setPSFYJ(-89); fj_uav_panoramic.setPSFYJ(-89);
fj_uav_panoramic.setPSJD(337); fj_uav_panoramic.setPSJD(337);
fj_uav_panoramic.setPSHGJ(0); fj_uav_panoramic.setPSHGJ(0);
fj_uav_panoramic.setPSJJ(24d); fj_uav_panoramic.setPSJJ(24);
fj_uav_panoramic.setXDGD(112.00d); fj_uav_panoramic.setXDGD(112.00d);
fj_uav_panoramic.setFJYSKD(8192); fj_uav_panoramic.setFJYSKD(8192);
fj_uav_panoramic.setFJYSGD(4096); fj_uav_panoramic.setFJYSGD(4096);
@ -393,7 +393,7 @@ public class DataRepositories {
fj_video.setPSFYJ(15); fj_video.setPSFYJ(15);
fj_video.setPSJD(230); fj_video.setPSJD(230);
fj_video.setPSHGJ(0); fj_video.setPSHGJ(0);
fj_video.setPSJJ(27d); fj_video.setPSJJ(27);
fj_video.setXDGD(1.50d); fj_video.setXDGD(1.50d);
fj_video.setFJYSKD(480); fj_video.setFJYSKD(480);
fj_video.setFJYSGD(360); fj_video.setFJYSGD(360);

@ -135,7 +135,7 @@ public class FJ implements Serializable {
* 拍摄焦距: * 拍摄焦距:
* 35mm等效焦距单位mm当附件类型为[0手机照片][1无人机照片]时必填 * 35mm等效焦距单位mm当附件类型为[0手机照片][1无人机照片]时必填
*/ */
private Double PSJJ; private Integer PSJJ;
/** /**
* 附件原始宽度: * 附件原始宽度:
@ -329,11 +329,11 @@ public class FJ implements Serializable {
this.PSHGJ = PSHGJ; this.PSHGJ = PSHGJ;
} }
public Double getPSJJ() { public Integer getPSJJ() {
return PSJJ; return PSJJ;
} }
public void setPSJJ(Double PSJJ) { public void setPSJJ(Integer PSJJ) {
this.PSJJ = PSJJ; this.PSJJ = PSJJ;
} }

Loading…
Cancel
Save