diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index 21ffddc..eb82e69 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -1,6 +1,8 @@ package com.casic.birmm.inspect.greendao; -import java.util.Map; +import com.casic.birmm.inspect.bean.InspectionLocalBean; +import com.casic.birmm.inspect.bean.RouteLocalBean; +import com.casic.birmm.inspect.bean.TaskEventLocalBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,11 +10,7 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionLocalBean; -import com.casic.birmm.inspect.bean.TaskEventLocalBean; - -import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; -import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -24,9 +22,11 @@ public class DaoSession extends AbstractDaoSession { private final DaoConfig inspectionLocalBeanDaoConfig; + private final DaoConfig routeLocalBeanDaoConfig; private final DaoConfig taskEventLocalBeanDaoConfig; private final InspectionLocalBeanDao inspectionLocalBeanDao; + private final RouteLocalBeanDao routeLocalBeanDao; private final TaskEventLocalBeanDao taskEventLocalBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> @@ -36,18 +36,24 @@ inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); inspectionLocalBeanDaoConfig.initIdentityScope(type); + routeLocalBeanDaoConfig = daoConfigMap.get(RouteLocalBeanDao.class).clone(); + routeLocalBeanDaoConfig.initIdentityScope(type); + taskEventLocalBeanDaoConfig = daoConfigMap.get(TaskEventLocalBeanDao.class).clone(); taskEventLocalBeanDaoConfig.initIdentityScope(type); inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); + routeLocalBeanDao = new RouteLocalBeanDao(routeLocalBeanDaoConfig, this); taskEventLocalBeanDao = new TaskEventLocalBeanDao(taskEventLocalBeanDaoConfig, this); registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); + registerDao(RouteLocalBean.class, routeLocalBeanDao); registerDao(TaskEventLocalBean.class, taskEventLocalBeanDao); } - + public void clear() { inspectionLocalBeanDaoConfig.clearIdentityScope(); + routeLocalBeanDaoConfig.clearIdentityScope(); taskEventLocalBeanDaoConfig.clearIdentityScope(); } @@ -55,6 +61,10 @@ return inspectionLocalBeanDao; } + public RouteLocalBeanDao getRouteLocalBeanDao() { + return routeLocalBeanDao; + } + public TaskEventLocalBeanDao getTaskEventLocalBeanDao() { return taskEventLocalBeanDao; } diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index 21ffddc..eb82e69 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -1,6 +1,8 @@ package com.casic.birmm.inspect.greendao; -import java.util.Map; +import com.casic.birmm.inspect.bean.InspectionLocalBean; +import com.casic.birmm.inspect.bean.RouteLocalBean; +import com.casic.birmm.inspect.bean.TaskEventLocalBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,11 +10,7 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionLocalBean; -import com.casic.birmm.inspect.bean.TaskEventLocalBean; - -import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; -import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -24,9 +22,11 @@ public class DaoSession extends AbstractDaoSession { private final DaoConfig inspectionLocalBeanDaoConfig; + private final DaoConfig routeLocalBeanDaoConfig; private final DaoConfig taskEventLocalBeanDaoConfig; private final InspectionLocalBeanDao inspectionLocalBeanDao; + private final RouteLocalBeanDao routeLocalBeanDao; private final TaskEventLocalBeanDao taskEventLocalBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> @@ -36,18 +36,24 @@ inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); inspectionLocalBeanDaoConfig.initIdentityScope(type); + routeLocalBeanDaoConfig = daoConfigMap.get(RouteLocalBeanDao.class).clone(); + routeLocalBeanDaoConfig.initIdentityScope(type); + taskEventLocalBeanDaoConfig = daoConfigMap.get(TaskEventLocalBeanDao.class).clone(); taskEventLocalBeanDaoConfig.initIdentityScope(type); inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); + routeLocalBeanDao = new RouteLocalBeanDao(routeLocalBeanDaoConfig, this); taskEventLocalBeanDao = new TaskEventLocalBeanDao(taskEventLocalBeanDaoConfig, this); registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); + registerDao(RouteLocalBean.class, routeLocalBeanDao); registerDao(TaskEventLocalBean.class, taskEventLocalBeanDao); } - + public void clear() { inspectionLocalBeanDaoConfig.clearIdentityScope(); + routeLocalBeanDaoConfig.clearIdentityScope(); taskEventLocalBeanDaoConfig.clearIdentityScope(); } @@ -55,6 +61,10 @@ return inspectionLocalBeanDao; } + public RouteLocalBeanDao getRouteLocalBeanDao() { + return routeLocalBeanDao; + } + public TaskEventLocalBeanDao getTaskEventLocalBeanDao() { return taskEventLocalBeanDao; } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index adea918..2a8e110 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -36,9 +36,8 @@ public final static Property EndLng = new Property(9, double.class, "endLng", false, "END_LNG"); public final static Property EndLat = new Property(10, double.class, "endLat", false, "END_LAT"); public final static Property EndAddress = new Property(11, String.class, "endAddress", false, "END_ADDRESS"); - public final static Property Routes = new Property(12, String.class, "routes", false, "ROUTES"); - public final static Property Distance = new Property(13, double.class, "distance", false, "DISTANCE"); - public final static Property User = new Property(14, String.class, "user", false, "USER"); + public final static Property Distance = new Property(12, double.class, "distance", false, "DISTANCE"); + public final static Property User = new Property(13, String.class, "user", false, "USER"); } @@ -66,9 +65,8 @@ "\"END_LNG\" REAL NOT NULL ," + // 9: endLng "\"END_LAT\" REAL NOT NULL ," + // 10: endLat "\"END_ADDRESS\" TEXT," + // 11: endAddress - "\"ROUTES\" TEXT," + // 12: routes - "\"DISTANCE\" REAL NOT NULL ," + // 13: distance - "\"USER\" TEXT);"); // 14: user + "\"DISTANCE\" REAL NOT NULL ," + // 12: distance + "\"USER\" TEXT);"); // 13: user } /** Drops the underlying database table. */ @@ -124,16 +122,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -184,16 +177,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -217,9 +205,8 @@ cursor.getDouble(offset + 9), // endLng cursor.getDouble(offset + 10), // endLat cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // endAddress - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // routes - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.getDouble(offset + 12), // distance + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13) // user ); return entity; } @@ -238,9 +225,8 @@ entity.setEndLng(cursor.getDouble(offset + 9)); entity.setEndLat(cursor.getDouble(offset + 10)); entity.setEndAddress(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - entity.setRoutes(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); - entity.setDistance(cursor.getDouble(offset + 13)); - entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); + entity.setDistance(cursor.getDouble(offset + 12)); + entity.setUser(cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13)); } @Override diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index 21ffddc..eb82e69 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -1,6 +1,8 @@ package com.casic.birmm.inspect.greendao; -import java.util.Map; +import com.casic.birmm.inspect.bean.InspectionLocalBean; +import com.casic.birmm.inspect.bean.RouteLocalBean; +import com.casic.birmm.inspect.bean.TaskEventLocalBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,11 +10,7 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionLocalBean; -import com.casic.birmm.inspect.bean.TaskEventLocalBean; - -import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; -import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -24,9 +22,11 @@ public class DaoSession extends AbstractDaoSession { private final DaoConfig inspectionLocalBeanDaoConfig; + private final DaoConfig routeLocalBeanDaoConfig; private final DaoConfig taskEventLocalBeanDaoConfig; private final InspectionLocalBeanDao inspectionLocalBeanDao; + private final RouteLocalBeanDao routeLocalBeanDao; private final TaskEventLocalBeanDao taskEventLocalBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> @@ -36,18 +36,24 @@ inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); inspectionLocalBeanDaoConfig.initIdentityScope(type); + routeLocalBeanDaoConfig = daoConfigMap.get(RouteLocalBeanDao.class).clone(); + routeLocalBeanDaoConfig.initIdentityScope(type); + taskEventLocalBeanDaoConfig = daoConfigMap.get(TaskEventLocalBeanDao.class).clone(); taskEventLocalBeanDaoConfig.initIdentityScope(type); inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); + routeLocalBeanDao = new RouteLocalBeanDao(routeLocalBeanDaoConfig, this); taskEventLocalBeanDao = new TaskEventLocalBeanDao(taskEventLocalBeanDaoConfig, this); registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); + registerDao(RouteLocalBean.class, routeLocalBeanDao); registerDao(TaskEventLocalBean.class, taskEventLocalBeanDao); } - + public void clear() { inspectionLocalBeanDaoConfig.clearIdentityScope(); + routeLocalBeanDaoConfig.clearIdentityScope(); taskEventLocalBeanDaoConfig.clearIdentityScope(); } @@ -55,6 +61,10 @@ return inspectionLocalBeanDao; } + public RouteLocalBeanDao getRouteLocalBeanDao() { + return routeLocalBeanDao; + } + public TaskEventLocalBeanDao getTaskEventLocalBeanDao() { return taskEventLocalBeanDao; } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index adea918..2a8e110 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -36,9 +36,8 @@ public final static Property EndLng = new Property(9, double.class, "endLng", false, "END_LNG"); public final static Property EndLat = new Property(10, double.class, "endLat", false, "END_LAT"); public final static Property EndAddress = new Property(11, String.class, "endAddress", false, "END_ADDRESS"); - public final static Property Routes = new Property(12, String.class, "routes", false, "ROUTES"); - public final static Property Distance = new Property(13, double.class, "distance", false, "DISTANCE"); - public final static Property User = new Property(14, String.class, "user", false, "USER"); + public final static Property Distance = new Property(12, double.class, "distance", false, "DISTANCE"); + public final static Property User = new Property(13, String.class, "user", false, "USER"); } @@ -66,9 +65,8 @@ "\"END_LNG\" REAL NOT NULL ," + // 9: endLng "\"END_LAT\" REAL NOT NULL ," + // 10: endLat "\"END_ADDRESS\" TEXT," + // 11: endAddress - "\"ROUTES\" TEXT," + // 12: routes - "\"DISTANCE\" REAL NOT NULL ," + // 13: distance - "\"USER\" TEXT);"); // 14: user + "\"DISTANCE\" REAL NOT NULL ," + // 12: distance + "\"USER\" TEXT);"); // 13: user } /** Drops the underlying database table. */ @@ -124,16 +122,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -184,16 +177,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -217,9 +205,8 @@ cursor.getDouble(offset + 9), // endLng cursor.getDouble(offset + 10), // endLat cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // endAddress - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // routes - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.getDouble(offset + 12), // distance + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13) // user ); return entity; } @@ -238,9 +225,8 @@ entity.setEndLng(cursor.getDouble(offset + 9)); entity.setEndLat(cursor.getDouble(offset + 10)); entity.setEndAddress(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - entity.setRoutes(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); - entity.setDistance(cursor.getDouble(offset + 13)); - entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); + entity.setDistance(cursor.getDouble(offset + 12)); + entity.setUser(cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13)); } @Override diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java new file mode 100644 index 0000000..ced0c48 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -0,0 +1,146 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import com.casic.birmm.inspect.bean.RouteLocalBean; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; +import org.greenrobot.greendao.internal.DaoConfig; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + +/** + * DAO for table "ROUTE_LOCAL_BEAN". + */ +public class RouteLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "ROUTE_LOCAL_BEAN"; + + /** + * Properties of entity RouteLocalBean.
+ * Can be used for QueryBuilder and for referencing column names. + */ + public static class Properties { + public final static Property Id = new Property(0, Long.class, "id", true, "_id"); + public final static Property InspectionId = new Property(1, String.class, "inspectionId", false, "INSPECTION_ID"); + public final static Property Lng = new Property(2, double.class, "lng", false, "LNG"); + public final static Property Lat = new Property(3, double.class, "lat", false, "LAT"); + } + + + public RouteLocalBeanDao(DaoConfig config) { + super(config); + } + + public RouteLocalBeanDao(DaoConfig config, DaoSession daoSession) { + super(config, daoSession); + } + + /** + * Creates the underlying database table. + */ + public static void createTable(Database db, boolean ifNotExists) { + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"LNG\" REAL NOT NULL ," + // 2: lng + "\"LAT\" REAL NOT NULL );"); // 3: lat + } + + /** + * Drops the underlying database table. + */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public RouteLocalBean readEntity(Cursor cursor, int offset) { + RouteLocalBean entity = new RouteLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.getDouble(offset + 2), // lng + cursor.getDouble(offset + 3) // lat + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, RouteLocalBean entity, int offset) { + entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); + entity.setInspectionId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); + entity.setLng(cursor.getDouble(offset + 2)); + entity.setLat(cursor.getDouble(offset + 3)); + } + + @Override + protected final Long updateKeyAfterInsert(RouteLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(RouteLocalBean entity) { + if (entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(RouteLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index 21ffddc..eb82e69 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -1,6 +1,8 @@ package com.casic.birmm.inspect.greendao; -import java.util.Map; +import com.casic.birmm.inspect.bean.InspectionLocalBean; +import com.casic.birmm.inspect.bean.RouteLocalBean; +import com.casic.birmm.inspect.bean.TaskEventLocalBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,11 +10,7 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionLocalBean; -import com.casic.birmm.inspect.bean.TaskEventLocalBean; - -import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; -import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -24,9 +22,11 @@ public class DaoSession extends AbstractDaoSession { private final DaoConfig inspectionLocalBeanDaoConfig; + private final DaoConfig routeLocalBeanDaoConfig; private final DaoConfig taskEventLocalBeanDaoConfig; private final InspectionLocalBeanDao inspectionLocalBeanDao; + private final RouteLocalBeanDao routeLocalBeanDao; private final TaskEventLocalBeanDao taskEventLocalBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> @@ -36,18 +36,24 @@ inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); inspectionLocalBeanDaoConfig.initIdentityScope(type); + routeLocalBeanDaoConfig = daoConfigMap.get(RouteLocalBeanDao.class).clone(); + routeLocalBeanDaoConfig.initIdentityScope(type); + taskEventLocalBeanDaoConfig = daoConfigMap.get(TaskEventLocalBeanDao.class).clone(); taskEventLocalBeanDaoConfig.initIdentityScope(type); inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); + routeLocalBeanDao = new RouteLocalBeanDao(routeLocalBeanDaoConfig, this); taskEventLocalBeanDao = new TaskEventLocalBeanDao(taskEventLocalBeanDaoConfig, this); registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); + registerDao(RouteLocalBean.class, routeLocalBeanDao); registerDao(TaskEventLocalBean.class, taskEventLocalBeanDao); } - + public void clear() { inspectionLocalBeanDaoConfig.clearIdentityScope(); + routeLocalBeanDaoConfig.clearIdentityScope(); taskEventLocalBeanDaoConfig.clearIdentityScope(); } @@ -55,6 +61,10 @@ return inspectionLocalBeanDao; } + public RouteLocalBeanDao getRouteLocalBeanDao() { + return routeLocalBeanDao; + } + public TaskEventLocalBeanDao getTaskEventLocalBeanDao() { return taskEventLocalBeanDao; } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index adea918..2a8e110 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -36,9 +36,8 @@ public final static Property EndLng = new Property(9, double.class, "endLng", false, "END_LNG"); public final static Property EndLat = new Property(10, double.class, "endLat", false, "END_LAT"); public final static Property EndAddress = new Property(11, String.class, "endAddress", false, "END_ADDRESS"); - public final static Property Routes = new Property(12, String.class, "routes", false, "ROUTES"); - public final static Property Distance = new Property(13, double.class, "distance", false, "DISTANCE"); - public final static Property User = new Property(14, String.class, "user", false, "USER"); + public final static Property Distance = new Property(12, double.class, "distance", false, "DISTANCE"); + public final static Property User = new Property(13, String.class, "user", false, "USER"); } @@ -66,9 +65,8 @@ "\"END_LNG\" REAL NOT NULL ," + // 9: endLng "\"END_LAT\" REAL NOT NULL ," + // 10: endLat "\"END_ADDRESS\" TEXT," + // 11: endAddress - "\"ROUTES\" TEXT," + // 12: routes - "\"DISTANCE\" REAL NOT NULL ," + // 13: distance - "\"USER\" TEXT);"); // 14: user + "\"DISTANCE\" REAL NOT NULL ," + // 12: distance + "\"USER\" TEXT);"); // 13: user } /** Drops the underlying database table. */ @@ -124,16 +122,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -184,16 +177,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -217,9 +205,8 @@ cursor.getDouble(offset + 9), // endLng cursor.getDouble(offset + 10), // endLat cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // endAddress - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // routes - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.getDouble(offset + 12), // distance + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13) // user ); return entity; } @@ -238,9 +225,8 @@ entity.setEndLng(cursor.getDouble(offset + 9)); entity.setEndLat(cursor.getDouble(offset + 10)); entity.setEndAddress(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - entity.setRoutes(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); - entity.setDistance(cursor.getDouble(offset + 13)); - entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); + entity.setDistance(cursor.getDouble(offset + 12)); + entity.setUser(cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13)); } @Override diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java new file mode 100644 index 0000000..ced0c48 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -0,0 +1,146 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import com.casic.birmm.inspect.bean.RouteLocalBean; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; +import org.greenrobot.greendao.internal.DaoConfig; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + +/** + * DAO for table "ROUTE_LOCAL_BEAN". + */ +public class RouteLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "ROUTE_LOCAL_BEAN"; + + /** + * Properties of entity RouteLocalBean.
+ * Can be used for QueryBuilder and for referencing column names. + */ + public static class Properties { + public final static Property Id = new Property(0, Long.class, "id", true, "_id"); + public final static Property InspectionId = new Property(1, String.class, "inspectionId", false, "INSPECTION_ID"); + public final static Property Lng = new Property(2, double.class, "lng", false, "LNG"); + public final static Property Lat = new Property(3, double.class, "lat", false, "LAT"); + } + + + public RouteLocalBeanDao(DaoConfig config) { + super(config); + } + + public RouteLocalBeanDao(DaoConfig config, DaoSession daoSession) { + super(config, daoSession); + } + + /** + * Creates the underlying database table. + */ + public static void createTable(Database db, boolean ifNotExists) { + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"LNG\" REAL NOT NULL ," + // 2: lng + "\"LAT\" REAL NOT NULL );"); // 3: lat + } + + /** + * Drops the underlying database table. + */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public RouteLocalBean readEntity(Cursor cursor, int offset) { + RouteLocalBean entity = new RouteLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.getDouble(offset + 2), // lng + cursor.getDouble(offset + 3) // lat + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, RouteLocalBean entity, int offset) { + entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); + entity.setInspectionId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); + entity.setLng(cursor.getDouble(offset + 2)); + entity.setLat(cursor.getDouble(offset + 3)); + } + + @Override + protected final Long updateKeyAfterInsert(RouteLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(RouteLocalBean entity) { + if (entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(RouteLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 7c00304..912eb4f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -9,10 +9,7 @@ import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.* import com.casic.birmm.inspect.R -import com.casic.birmm.inspect.model.RoutePointModel import com.casic.birmm.inspect.utils.DataBaseManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.Constant @@ -24,7 +21,6 @@ class InspectionRouteActivity : AppCompatActivity() { - private val gson by lazy { Gson() } private lateinit var aMap: AMap override fun onCreate(savedInstanceState: Bundle?) { @@ -47,7 +43,7 @@ } } - private fun initMap(savedInstanceState: Bundle?, id: String) { + private fun initMap(savedInstanceState: Bundle?, inspectionId: String) { mapView.onCreate(savedInstanceState) aMap = mapView.map val uiSettings = aMap.uiSettings @@ -55,7 +51,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //根据id查询详情 - val detailData = DataBaseManager.get.queryInspectDetailById(id) + val detailData = DataBaseManager.get.queryInspectDetailById(inspectionId) inspectMsgView.text = detailData.inspectionTitle startTimeView.text = detailData.startTime @@ -75,16 +71,16 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //瞄点画线 - if (detailData.routes.isEmpty()) { + val routes = DataBaseManager.get.queryInspectRouteById(inspectionId) + if (routes.isEmpty()) { return } //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] - val type = object : TypeToken>() {}.type - val routeModels = gson.fromJson>(detailData.routes, type) //画线 val latLngPoints: ArrayList = ArrayList() - routeModels.forEach { routeModel -> + routes.forEach { routeModel -> latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( diff --git a/app/build.gradle b/app/build.gradle index 067a62a..2bdfa0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" } buildTypes { @@ -30,7 +30,9 @@ minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } + ndk { + abiFilters 'armeabi-v7a', "arm64-v8a" + } } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java index b049ab6..93a8a4c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -23,14 +23,14 @@ private double endLng; // 结束经度 private double endLat; // 结束维度 private String endAddress; // 开始点位置 - private String routes; // 路线Json private double distance; // 路线点距离 private String user; // 巡检人 - @Generated(hash = 1830851884) - public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, String startTime, - String endTime, String date, double startLng, double startLat, String startAddress, double endLng, - double endLat, String endAddress, String routes, double distance, String user) { + @Generated(hash = 874301046) + public InspectionLocalBean(Long id, String inspectionId, String inspectionTitle, + String startTime, String endTime, String date, double startLng, + double startLat, String startAddress, double endLng, double endLat, + String endAddress, double distance, String user) { this.id = id; this.inspectionId = inspectionId; this.inspectionTitle = inspectionTitle; @@ -43,7 +43,6 @@ this.endLng = endLng; this.endLat = endLat; this.endAddress = endAddress; - this.routes = routes; this.distance = distance; this.user = user; } @@ -116,6 +115,14 @@ this.startLat = startLat; } + public String getStartAddress() { + return this.startAddress; + } + + public void setStartAddress(String startAddress) { + this.startAddress = startAddress; + } + public double getEndLng() { return this.endLng; } @@ -132,20 +139,12 @@ this.endLat = endLat; } - public String getRoutes() { - return this.routes; + public String getEndAddress() { + return this.endAddress; } - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; + public void setEndAddress(String endAddress) { + this.endAddress = endAddress; } public double getDistance() { @@ -156,19 +155,11 @@ this.distance = distance; } - public String getStartAddress() { - return this.startAddress; + public String getUser() { + return this.user; } - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getEndAddress() { - return this.endAddress; - } - - public void setEndAddress(String endAddress) { - this.endAddress = endAddress; + public void setUser(String user) { + this.user = user; } } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java new file mode 100644 index 0000000..5f20010 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/RouteLocalBean.java @@ -0,0 +1,60 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//巡检路线点单独存表,否则数据量太大,一行存不下 +@Entity +public class RouteLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private double lng; // 经度 + private double lat; // 纬度 + + @Generated(hash = 1532377035) + public RouteLocalBean(Long id, String inspectionId, double lng, double lat) { + this.id = id; + this.inspectionId = inspectionId; + this.lng = lng; + this.lat = lat; + } + + @Generated(hash = 1622175665) + public RouteLocalBean() { + } + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInspectionId() { + return this.inspectionId; + } + + public void setInspectionId(String inspectionId) { + this.inspectionId = inspectionId; + } + + public double getLng() { + return this.lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt b/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt deleted file mode 100644 index 01bc6d9..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/callback/OnDataAddListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.birmm.inspect.callback - -interface OnDataAddListener { - fun onAddSuccess() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index d84053c..1933d4d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -6,9 +6,9 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; @@ -22,12 +22,14 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); + RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); + RouteLocalBeanDao.dropTable(db, ifExists); TaskEventLocalBeanDao.dropTable(db, ifExists); } @@ -48,6 +50,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); registerDaoClass(InspectionLocalBeanDao.class); + registerDaoClass(RouteLocalBeanDao.class); registerDaoClass(TaskEventLocalBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index 21ffddc..eb82e69 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -1,6 +1,8 @@ package com.casic.birmm.inspect.greendao; -import java.util.Map; +import com.casic.birmm.inspect.bean.InspectionLocalBean; +import com.casic.birmm.inspect.bean.RouteLocalBean; +import com.casic.birmm.inspect.bean.TaskEventLocalBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,11 +10,7 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionLocalBean; -import com.casic.birmm.inspect.bean.TaskEventLocalBean; - -import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; -import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -24,9 +22,11 @@ public class DaoSession extends AbstractDaoSession { private final DaoConfig inspectionLocalBeanDaoConfig; + private final DaoConfig routeLocalBeanDaoConfig; private final DaoConfig taskEventLocalBeanDaoConfig; private final InspectionLocalBeanDao inspectionLocalBeanDao; + private final RouteLocalBeanDao routeLocalBeanDao; private final TaskEventLocalBeanDao taskEventLocalBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> @@ -36,18 +36,24 @@ inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); inspectionLocalBeanDaoConfig.initIdentityScope(type); + routeLocalBeanDaoConfig = daoConfigMap.get(RouteLocalBeanDao.class).clone(); + routeLocalBeanDaoConfig.initIdentityScope(type); + taskEventLocalBeanDaoConfig = daoConfigMap.get(TaskEventLocalBeanDao.class).clone(); taskEventLocalBeanDaoConfig.initIdentityScope(type); inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); + routeLocalBeanDao = new RouteLocalBeanDao(routeLocalBeanDaoConfig, this); taskEventLocalBeanDao = new TaskEventLocalBeanDao(taskEventLocalBeanDaoConfig, this); registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); + registerDao(RouteLocalBean.class, routeLocalBeanDao); registerDao(TaskEventLocalBean.class, taskEventLocalBeanDao); } - + public void clear() { inspectionLocalBeanDaoConfig.clearIdentityScope(); + routeLocalBeanDaoConfig.clearIdentityScope(); taskEventLocalBeanDaoConfig.clearIdentityScope(); } @@ -55,6 +61,10 @@ return inspectionLocalBeanDao; } + public RouteLocalBeanDao getRouteLocalBeanDao() { + return routeLocalBeanDao; + } + public TaskEventLocalBeanDao getTaskEventLocalBeanDao() { return taskEventLocalBeanDao; } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index adea918..2a8e110 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -36,9 +36,8 @@ public final static Property EndLng = new Property(9, double.class, "endLng", false, "END_LNG"); public final static Property EndLat = new Property(10, double.class, "endLat", false, "END_LAT"); public final static Property EndAddress = new Property(11, String.class, "endAddress", false, "END_ADDRESS"); - public final static Property Routes = new Property(12, String.class, "routes", false, "ROUTES"); - public final static Property Distance = new Property(13, double.class, "distance", false, "DISTANCE"); - public final static Property User = new Property(14, String.class, "user", false, "USER"); + public final static Property Distance = new Property(12, double.class, "distance", false, "DISTANCE"); + public final static Property User = new Property(13, String.class, "user", false, "USER"); } @@ -66,9 +65,8 @@ "\"END_LNG\" REAL NOT NULL ," + // 9: endLng "\"END_LAT\" REAL NOT NULL ," + // 10: endLat "\"END_ADDRESS\" TEXT," + // 11: endAddress - "\"ROUTES\" TEXT," + // 12: routes - "\"DISTANCE\" REAL NOT NULL ," + // 13: distance - "\"USER\" TEXT);"); // 14: user + "\"DISTANCE\" REAL NOT NULL ," + // 12: distance + "\"USER\" TEXT);"); // 13: user } /** Drops the underlying database table. */ @@ -124,16 +122,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -184,16 +177,11 @@ if (endAddress != null) { stmt.bindString(12, endAddress); } - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(13, routes); - } - stmt.bindDouble(14, entity.getDistance()); + stmt.bindDouble(13, entity.getDistance()); String user = entity.getUser(); if (user != null) { - stmt.bindString(15, user); + stmt.bindString(14, user); } } @@ -217,9 +205,8 @@ cursor.getDouble(offset + 9), // endLng cursor.getDouble(offset + 10), // endLat cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // endAddress - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // routes - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.getDouble(offset + 12), // distance + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13) // user ); return entity; } @@ -238,9 +225,8 @@ entity.setEndLng(cursor.getDouble(offset + 9)); entity.setEndLat(cursor.getDouble(offset + 10)); entity.setEndAddress(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - entity.setRoutes(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); - entity.setDistance(cursor.getDouble(offset + 13)); - entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); + entity.setDistance(cursor.getDouble(offset + 12)); + entity.setUser(cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13)); } @Override diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java new file mode 100644 index 0000000..ced0c48 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -0,0 +1,146 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import com.casic.birmm.inspect.bean.RouteLocalBean; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; +import org.greenrobot.greendao.internal.DaoConfig; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + +/** + * DAO for table "ROUTE_LOCAL_BEAN". + */ +public class RouteLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "ROUTE_LOCAL_BEAN"; + + /** + * Properties of entity RouteLocalBean.
+ * Can be used for QueryBuilder and for referencing column names. + */ + public static class Properties { + public final static Property Id = new Property(0, Long.class, "id", true, "_id"); + public final static Property InspectionId = new Property(1, String.class, "inspectionId", false, "INSPECTION_ID"); + public final static Property Lng = new Property(2, double.class, "lng", false, "LNG"); + public final static Property Lat = new Property(3, double.class, "lat", false, "LAT"); + } + + + public RouteLocalBeanDao(DaoConfig config) { + super(config); + } + + public RouteLocalBeanDao(DaoConfig config, DaoSession daoSession) { + super(config, daoSession); + } + + /** + * Creates the underlying database table. + */ + public static void createTable(Database db, boolean ifNotExists) { + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"LNG\" REAL NOT NULL ," + // 2: lng + "\"LAT\" REAL NOT NULL );"); // 3: lat + } + + /** + * Drops the underlying database table. + */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { + stmt.clearBindings(); + + Long id = entity.getId(); + if (id != null) { + stmt.bindLong(1, id); + } + + String inspectionId = entity.getInspectionId(); + if (inspectionId != null) { + stmt.bindString(2, inspectionId); + } + stmt.bindDouble(3, entity.getLng()); + stmt.bindDouble(4, entity.getLat()); + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public RouteLocalBean readEntity(Cursor cursor, int offset) { + RouteLocalBean entity = new RouteLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.getDouble(offset + 2), // lng + cursor.getDouble(offset + 3) // lat + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, RouteLocalBean entity, int offset) { + entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); + entity.setInspectionId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); + entity.setLng(cursor.getDouble(offset + 2)); + entity.setLat(cursor.getDouble(offset + 3)); + } + + @Override + protected final Long updateKeyAfterInsert(RouteLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(RouteLocalBean entity) { + if (entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(RouteLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 7c00304..912eb4f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -9,10 +9,7 @@ import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.* import com.casic.birmm.inspect.R -import com.casic.birmm.inspect.model.RoutePointModel import com.casic.birmm.inspect.utils.DataBaseManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.Constant @@ -24,7 +21,6 @@ class InspectionRouteActivity : AppCompatActivity() { - private val gson by lazy { Gson() } private lateinit var aMap: AMap override fun onCreate(savedInstanceState: Bundle?) { @@ -47,7 +43,7 @@ } } - private fun initMap(savedInstanceState: Bundle?, id: String) { + private fun initMap(savedInstanceState: Bundle?, inspectionId: String) { mapView.onCreate(savedInstanceState) aMap = mapView.map val uiSettings = aMap.uiSettings @@ -55,7 +51,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //根据id查询详情 - val detailData = DataBaseManager.get.queryInspectDetailById(id) + val detailData = DataBaseManager.get.queryInspectDetailById(inspectionId) inspectMsgView.text = detailData.inspectionTitle startTimeView.text = detailData.startTime @@ -75,16 +71,16 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //瞄点画线 - if (detailData.routes.isEmpty()) { + val routes = DataBaseManager.get.queryInspectRouteById(inspectionId) + if (routes.isEmpty()) { return } //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] - val type = object : TypeToken>() {}.type - val routeModels = gson.fromJson>(detailData.routes, type) //画线 val latLngPoints: ArrayList = ArrayList() - routeModels.forEach { routeModel -> + routes.forEach { routeModel -> latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt index c314640..bbe9d20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt @@ -3,18 +3,19 @@ import com.amap.api.maps.model.LatLng import com.casic.birmm.inspect.base.BaseApplication import com.casic.birmm.inspect.bean.InspectionLocalBean +import com.casic.birmm.inspect.bean.RouteLocalBean import com.casic.birmm.inspect.bean.TaskEventLocalBean -import com.casic.birmm.inspect.callback.OnDataAddListener import com.casic.birmm.inspect.callback.OnDistanceSearchListener import com.casic.birmm.inspect.callback.OnGeocodeSearchListener import com.casic.birmm.inspect.extensions.calculateDistance import com.casic.birmm.inspect.extensions.toChinese import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao +import com.casic.birmm.inspect.greendao.RouteLocalBeanDao import com.casic.birmm.inspect.greendao.TaskEventLocalBeanDao import com.casic.birmm.inspect.model.RoutePointModel +import com.casic.birmm.inspect.single.fragment.HomePageFragment import com.casic.birmm.inspect.single.fragment.QueryEventFragment import com.casic.birmm.inspect.single.fragment.QueryInspectionFragment -import com.google.gson.Gson class DataBaseManager private constructor() { @@ -27,11 +28,9 @@ } } - private var inspectionDao: InspectionLocalBeanDao = - BaseApplication.get().getDaoSession().inspectionLocalBeanDao - private var taskEventDao: TaskEventLocalBeanDao = - BaseApplication.get().getDaoSession().taskEventLocalBeanDao - private val gson by lazy { Gson() } + private var inspectionDao = BaseApplication.get().getDaoSession().inspectionLocalBeanDao + private var routeLocalBeanDao = BaseApplication.get().getDaoSession().routeLocalBeanDao + private var taskEventDao = BaseApplication.get().getDaoSession().taskEventLocalBeanDao /** * 保存巡检记录到本地 @@ -46,8 +45,7 @@ startLat: Double, endLng: Double, endLat: Double, - routes: ArrayList, - listener: OnDataAddListener + routes: ArrayList ) { val bean = InspectionLocalBean() bean.inspectionId = inspectionId @@ -59,9 +57,16 @@ bean.startLat = startLat bean.endLng = endLng bean.endLat = endLat - bean.routes = gson.toJson(routes) bean.user = "超级管理员" + routes.forEach { + val localBean = RouteLocalBean() + localBean.inspectionId = inspectionId + localBean.lat = it.lat + localBean.lng = it.lng + routeLocalBeanDao.insert(localBean) + } + LatLng(startLat, startLng).toChinese(object : OnGeocodeSearchListener { override fun onRegionCodeSearched(address: String) { bean.startAddress = address @@ -82,7 +87,9 @@ 2023081202 ) - listener.onAddSuccess() + HomePageFragment.weakReferenceHandler.sendEmptyMessage( + 2023081301 + ) } } }) @@ -134,6 +141,15 @@ } /** + * id查询巡检路线 + */ + fun queryInspectRouteById(inspectionId: String): List { + return routeLocalBeanDao.queryBuilder().where( + RouteLocalBeanDao.Properties.InspectionId.eq(inspectionId) + ).list() + } + + /** * 查询所有巡检数据 */ fun loadInspection(): MutableList {