From 27516a156dee86d8d93bfc99ac76222e45253b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=BB=84=E8=80=80?= <zhuhuangyao@kingoit.com>
Date: Thu, 24 Nov 2022 11:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=8B=8D=E6=91=84=E7=84=A6?=
 =?UTF-8?q?=E8=B7=9D:Double=20->=20Integer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/landcloud_demo.db         | Bin 19456 -> 19456 bytes
 .../survey/data/DataRepositories.java         |  10 +++++-----
 .../cn/org/landcloud/survey/data/bean/FJ.java |   6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/landcloud_demo.db b/app/src/main/assets/landcloud_demo.db
index 6c2b970dcdf920b2239c61f7fe0baf1ebb513c38..e28539ddb045c97f357b42730bf2c9b0758b1f51 100644
GIT binary patch
delta 423
zcmZpe!Pqc^ae}m9I0FNNFcdQb=^GPujDdoB{<W+?9uxC7Aju%Kv7m*Shcyz&WCszf
z{+n1>c$irj&P-+(n85}V(Y2SHe9={6^IidWb`dtl0tTiS=3=HDOr4B#84DP_84V{o
zif-1GkYi*4DpsAG$f&?5IQhNTo5@?<bSIy7eYLq*x>sWo4~qa3V>JWg0wCcIgbWPs
zlSMp?*_hrlc!%nPEST)zAuxHJs~Got1`eP!5HNdAp5`$N<c0ziC8AtFAzg8OeMaTz
z$?=Rz-25%EQS9P^f{dN2o9!hM7$^Vn^k?_<3vqRK4VvulwLk!58W1o6u^<o&Y!+})
zU}STQW)nv>IIxuqXb{lgPUn)uq@2{^!knb|lGNOScrZ8K5JQ01Imp#9#8n~0(aFbE
TK?y^C@*e@?%{>yr7;XXp5>{>a

delta 375
zcmZpe!Pqc^ae}m97y|=?Fc1p?F*6Wfov33B6x8#tWd-t>n7;u@2H}kbEzCSz!9XT^
z2#{b6*u=uZ!_3Mse=@tkjL9)lx|`1kSg?yQGj%dB7c=buQl^ZCOm>WhjD`~(MK|k8
z$T3dd<`y#flbi5l1$Pz@&FtasHTi>^D2JDq5@(RBqtE07_XTXa!EEA=(vt%vB{naY
ziqxDKz|P48w2&W&c{dAqC@@ZbArQdk7|JFdst-~%*};W<a*m5U?;{2dpc)2*{>jUw
z&VXFT!oa{Nx0zQ+icy3YsDOoG5(Bdg(|d+V%(oeo7_26XxEKQs;B+&JH!Lp9Ns2E?
z%`J#8NleN~jW-ems?inK*Jtds1&g#)M6iRo@?b8S`j)5&_Q}&+W^J}}lV)Urd1-Qi
P<QpdC$jR}HN{oU4-S=M-

diff --git a/app/src/main/java/cn/org/landcloud/survey/data/DataRepositories.java b/app/src/main/java/cn/org/landcloud/survey/data/DataRepositories.java
index 08d46bf..08616db 100644
--- a/app/src/main/java/cn/org/landcloud/survey/data/DataRepositories.java
+++ b/app/src/main/java/cn/org/landcloud/survey/data/DataRepositories.java
@@ -185,7 +185,7 @@ public class DataRepositories {
         fj_phone_normal.setPSFYJ(19);
         fj_phone_normal.setPSJD(239);
         fj_phone_normal.setPSHGJ(0);
-        fj_phone_normal.setPSJJ(27d);
+        fj_phone_normal.setPSJJ(27);
         fj_phone_normal.setXDGD(1.50d);
         fj_phone_normal.setFJYSKD(1920);
         fj_phone_normal.setFJYSGD(1080);
@@ -243,7 +243,7 @@ public class DataRepositories {
         fj_phone_panoramic.setPSFYJ(26);
         fj_phone_panoramic.setPSJD(22);
         fj_phone_panoramic.setPSHGJ(-88);
-        fj_phone_panoramic.setPSJJ(27d);
+        fj_phone_panoramic.setPSJJ(27);
         fj_phone_panoramic.setXDGD(1.50d);
         fj_phone_panoramic.setFJYSKD(4096);
         fj_phone_panoramic.setFJYSGD(2048);
@@ -293,7 +293,7 @@ public class DataRepositories {
         fj_uav_normal.setPSFYJ(-60);
         fj_uav_normal.setPSJD(337);
         fj_uav_normal.setPSHGJ(0);
-        fj_uav_normal.setPSJJ(24d);
+        fj_uav_normal.setPSJJ(24);
         fj_uav_normal.setXDGD(111.00d);
         fj_uav_normal.setFJYSKD(4000);
         fj_uav_normal.setFJYSGD(2250);
@@ -344,7 +344,7 @@ public class DataRepositories {
         fj_uav_panoramic.setPSFYJ(-89);
         fj_uav_panoramic.setPSJD(337);
         fj_uav_panoramic.setPSHGJ(0);
-        fj_uav_panoramic.setPSJJ(24d);
+        fj_uav_panoramic.setPSJJ(24);
         fj_uav_panoramic.setXDGD(112.00d);
         fj_uav_panoramic.setFJYSKD(8192);
         fj_uav_panoramic.setFJYSGD(4096);
@@ -393,7 +393,7 @@ public class DataRepositories {
         fj_video.setPSFYJ(15);
         fj_video.setPSJD(230);
         fj_video.setPSHGJ(0);
-        fj_video.setPSJJ(27d);
+        fj_video.setPSJJ(27);
         fj_video.setXDGD(1.50d);
         fj_video.setFJYSKD(480);
         fj_video.setFJYSGD(360);
diff --git a/app/src/main/java/cn/org/landcloud/survey/data/bean/FJ.java b/app/src/main/java/cn/org/landcloud/survey/data/bean/FJ.java
index d1ea56d..87788b4 100644
--- a/app/src/main/java/cn/org/landcloud/survey/data/bean/FJ.java
+++ b/app/src/main/java/cn/org/landcloud/survey/data/bean/FJ.java
@@ -135,7 +135,7 @@ public class FJ implements Serializable {
      * 拍摄焦距:
      * 35mm等效焦距，单位mm，当附件类型为[0：手机照片]、[1：无人机照片]时必填。
      */
-    private Double PSJJ;
+    private Integer PSJJ;
 
     /**
      * 附件原始宽度:
@@ -329,11 +329,11 @@ public class FJ implements Serializable {
         this.PSHGJ = PSHGJ;
     }
 
-    public Double getPSJJ() {
+    public Integer getPSJJ() {
         return PSJJ;
     }
 
-    public void setPSJJ(Double PSJJ) {
+    public void setPSJJ(Integer PSJJ) {
         this.PSJJ = PSJJ;
     }