diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.class); } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index 9d629c5..89a854e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -3,6 +3,7 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.Observer @@ -16,10 +17,13 @@ import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R import com.casic.birmm.inspect.extensions.show +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.utils.OtherUtils import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -28,8 +32,13 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel + class InspectRouteActivity : AppCompatActivity(), CoroutineScope by MainScope() { + companion object { + private const val Tag = "InspectRouteActivity" + } + private lateinit var aMap: AMap private lateinit var id: String @@ -79,25 +88,24 @@ ) ) ) - aMap.moveCamera(CameraUpdateFactory.zoomTo(15.toFloat())) + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) + //设置起点 + addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) + //设置终点 + addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) //瞄点画线 val routeJson = detailData.routes!! if (routeJson.isEmpty()) { return@Observer } - val pointArray = routeJson - .replace("[[", "") - .replace("]]", "") - .split("],[") - //设置起点 - addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) - //设置终点 - addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] + Log.d(Tag, "路线: $routeJson") + val type = object : TypeToken>() {}.type + val routeModels = Gson().fromJson>(routeJson, type) //画线 val latLngPoints: ArrayList = ArrayList() - pointArray.forEach { point -> - val split = point.split(",") - latLngPoints.add(LatLng(split[1].toDouble(), split[0].toDouble())) + routeModels.forEach { routeModel -> + latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index 9d629c5..89a854e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -3,6 +3,7 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.Observer @@ -16,10 +17,13 @@ import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R import com.casic.birmm.inspect.extensions.show +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.utils.OtherUtils import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -28,8 +32,13 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel + class InspectRouteActivity : AppCompatActivity(), CoroutineScope by MainScope() { + companion object { + private const val Tag = "InspectRouteActivity" + } + private lateinit var aMap: AMap private lateinit var id: String @@ -79,25 +88,24 @@ ) ) ) - aMap.moveCamera(CameraUpdateFactory.zoomTo(15.toFloat())) + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) + //设置起点 + addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) + //设置终点 + addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) //瞄点画线 val routeJson = detailData.routes!! if (routeJson.isEmpty()) { return@Observer } - val pointArray = routeJson - .replace("[[", "") - .replace("]]", "") - .split("],[") - //设置起点 - addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) - //设置终点 - addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] + Log.d(Tag, "路线: $routeJson") + val type = object : TypeToken>() {}.type + val routeModels = Gson().fromJson>(routeJson, type) //画线 val latLngPoints: ArrayList = ArrayList() - pointArray.forEach { point -> - val split = point.split(",") - latLngPoints.add(LatLng(split[1].toDouble(), split[0].toDouble())) + routeModels.forEach { routeModel -> + latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 9ca5f8c..5b9fbd3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -120,6 +120,8 @@ authenticateViewModel.obtainPublicKey() } + singModeView.setChangeAlphaWhenPress(true) + //修改服务器配置 changeServerConfigView.setOnClickListener { val defaultValue = SaveKeyValues.getValue( @@ -129,6 +131,7 @@ InputDialog.Builder().setContext(this) .setTitle("请输入后台服务器地址") .setDefaultValue(defaultValue) + .setHintText("请输入服务器地址") .setNegativeButton("取消") .setPositiveButton("保存") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index 9d629c5..89a854e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -3,6 +3,7 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.Observer @@ -16,10 +17,13 @@ import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R import com.casic.birmm.inspect.extensions.show +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.utils.OtherUtils import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -28,8 +32,13 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel + class InspectRouteActivity : AppCompatActivity(), CoroutineScope by MainScope() { + companion object { + private const val Tag = "InspectRouteActivity" + } + private lateinit var aMap: AMap private lateinit var id: String @@ -79,25 +88,24 @@ ) ) ) - aMap.moveCamera(CameraUpdateFactory.zoomTo(15.toFloat())) + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) + //设置起点 + addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) + //设置终点 + addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) //瞄点画线 val routeJson = detailData.routes!! if (routeJson.isEmpty()) { return@Observer } - val pointArray = routeJson - .replace("[[", "") - .replace("]]", "") - .split("],[") - //设置起点 - addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) - //设置终点 - addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] + Log.d(Tag, "路线: $routeJson") + val type = object : TypeToken>() {}.type + val routeModels = Gson().fromJson>(routeJson, type) //画线 val latLngPoints: ArrayList = ArrayList() - pointArray.forEach { point -> - val split = point.split(",") - latLngPoints.add(LatLng(split[1].toDouble(), split[0].toDouble())) + routeModels.forEach { routeModel -> + latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 9ca5f8c..5b9fbd3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -120,6 +120,8 @@ authenticateViewModel.obtainPublicKey() } + singModeView.setChangeAlphaWhenPress(true) + //修改服务器配置 changeServerConfigView.setOnClickListener { val defaultValue = SaveKeyValues.getValue( @@ -129,6 +131,7 @@ InputDialog.Builder().setContext(this) .setTitle("请输入后台服务器地址") .setDefaultValue(defaultValue) + .setHintText("请输入服务器地址") .setNegativeButton("取消") .setPositiveButton("保存") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index 306e6aa..b98e223 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -16,7 +16,6 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.aihook.alertview.library.AlertView -import com.aihook.alertview.library.OnItemClickListener import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions @@ -26,9 +25,10 @@ import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean -import com.casic.birmm.inspect.bean.InspectionBean -import com.casic.birmm.inspect.bean.LocationBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.extensions.* +import com.casic.birmm.inspect.model.NewInspectionModel +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -68,9 +68,9 @@ private lateinit var inspectionName: String private lateinit var inspectionId: String private lateinit var userDataModel: UserInfoModel.DataBean - private lateinit var inspectionBean: InspectionBean + private lateinit var model: NewInspectionModel//新建巡检数据结构模型 private lateinit var vibrator: Vibrator - private var routes: MutableList = ArrayList()//路线点集和 + private var routeList: MutableList = ArrayList()//路线点集和 private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -412,6 +412,7 @@ locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle aMap.isMyLocationEnabled = true + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } fun initEvent() { @@ -458,12 +459,14 @@ private fun menuButtonEvent() { //结束巡检 stopInspectButton.setOnClickListener { - AlertView("温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), - null, this, AlertView.Style.Alert, OnItemClickListener { _, position -> - if (position == 0) { - stopInspection() - } - }).show() + AlertView( + "温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + stopInspection() + } + }.show() } //蓝牙按钮 @@ -534,11 +537,11 @@ val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) inspectTimeView.text = completeDate - inspectionBean = InspectionBean( - currentTimeMillis, inspectionId, inspectionName, completeDate, + model = NewInspectionModel( + inspectionId, inspectionName, completeDate, "", TimeOrDateUtil.timestampToDate(currentTimeMillis), 0.0, 0.0, 0.0, 0.0, - "", userDataModel.name + "", userDataModel.name!! ) startInspection() } @@ -550,42 +553,55 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - inspectionBean = gson.fromJson(currentInspection, InspectionBean::class.java) + val localBean = gson.fromJson(currentInspection, InspectionLocalBean::class.java) + model = NewInspectionModel( + localBean.inspectionId, localBean.name, localBean.startTime, "", localBean.date, + localBean.startLng, localBean.startLat, 0.0, 0.0, + localBean.routes, localBean.user + ) "欢迎回来，继续未完成巡检".show(this) startInspection() } } /** - * 开始巡检 - * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean + * 开始巡检，获取坐标 * */ private fun startInspection() { - Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { - aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) - if (routes.size <= 2) { - routes.add(LocationBean(it.longitude, it.latitude)) +// Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") + // 保存最新的一次位置，sp不支持保存double + SaveKeyValues.putValue(Constant.CURRENT_LONGITUDE, it.longitude.toString()) + SaveKeyValues.putValue(Constant.CURRENT_LATITUDE, it.latitude.toString()) + //设置起始经纬度 + if (model.startLng == 0.0 || model.startLat == 0.0) { + model.startLng = it.longitude + model.startLat = it.latitude + } + // 包装routes + if (routeList.size <= 2) { + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } else { //计算上一个点和当前点的距离 - val last = routes.size - 1 + val last = routeList.size - 1 val distance = AMapUtils.calculateLineDistance( - LatLng(routes[last].lat, routes[last].lng), + LatLng(routeList[last].lat, routeList[last].lng), LatLng(it.latitude, it.longitude) ) if (distance >= 10) { - routes.add(LocationBean(it.longitude, it.latitude)) - } else { - Log.d(Tag, "距离太近，无需添加路线点--->$last") + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } } - inspectionBean.routes = gson.toJson(routes) - if (inspectionBean.startLng == 0.0) { - inspectionBean.startLng = it.longitude - inspectionBean.startLat = it.latitude - } + model.routes = gson.toJson(routeList) +// Log.d(Tag, gson.toJson(routeList)) //根据定位时间间隔不停的覆盖保存巡检记录 - SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(inspectionBean)) + SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(model)) } } @@ -594,59 +610,55 @@ * 不管是手动结束还是页面销毁导致的结束，都保存巡检数据 * */ private fun stopInspection() { - LocationHelper.obtainCurrentLocation(this, object : ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation) { - routes.add( - LocationBean(aMapLocation.longitude, aMapLocation.latitude) - ) - /** - * 提交数据到后台 - * 上传成功之后finish当前页面并提示 - * 提交失败按照保存本地的逻辑走 - * - * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 - * */ - if (OtherUtils.isNetworkConnected(this@MapActivity)) { - addInspectionViewModel.addInspection( - id = inspectionBean.serverMainId, - name = inspectionBean.name, - startTime = inspectionBean.startTime, - endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), - date = inspectionBean.date, - startLng = inspectionBean.startLng, - startLat = inspectionBean.startLat, - endLng = aMapLocation.longitude, - endLat = aMapLocation.latitude, - routes = gson.toJson(routes), - user = userDataModel.name!! - ) - addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> - if (model.code == 200) { - "巡检记录保存成功".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) - } else { - //有网但是因为别的情况导致提交失败 - "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - } - finish() - }) - addInspectionViewModel.loadState.observe(this@MapActivity, Observer { - when (it) { - is LoadState.Loading -> { - OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") - } - else -> OtherUtils.dismissLoadingDialog() - } - }) + /** + * 提交数据到后台 + * 上传成功之后finish当前页面并提示 + * 提交失败按照保存本地的逻辑走 + * + * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 + * */ + if (OtherUtils.isNetworkConnected(this@MapActivity)) { + val endLng = SaveKeyValues.getValue(Constant.CURRENT_LONGITUDE, "0.0") as String + val endLat = SaveKeyValues.getValue(Constant.CURRENT_LATITUDE, "0.0") as String + + addInspectionViewModel.addInspection( + id = model.id, + name = model.name, + startTime = model.startTime, + endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), + date = model.date, + startLng = model.startLng, + startLat = model.startLat, + endLng = endLng.toDouble(), + endLat = endLat.toDouble(), + routes = model.routes, + user = userDataModel.name!! + ) + addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> + if (model.code == 200) { + "巡检记录保存成功".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) } else { - //无网导致提交失败 + //有网但是因为别的情况导致提交失败 "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - finish() } - } - }) + finish() + }) + addInspectionViewModel.loadState.observe(this@MapActivity, Observer { + when (it) { + is LoadState.Loading -> { + OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") + } + else -> OtherUtils.dismissLoadingDialog() + } + }) + } else { + //无网导致提交失败 + "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + finish() + } } /***以下是地图生命周期管理************************************************************************/ @@ -669,7 +681,7 @@ override fun onDestroy() { cancel() super.onDestroy() - stopInspection() +// stopInspection() BLEManager.disConnectDevice() mapView.onDestroy() } diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index 9d629c5..89a854e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -3,6 +3,7 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.Observer @@ -16,10 +17,13 @@ import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R import com.casic.birmm.inspect.extensions.show +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.utils.OtherUtils import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -28,8 +32,13 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel + class InspectRouteActivity : AppCompatActivity(), CoroutineScope by MainScope() { + companion object { + private const val Tag = "InspectRouteActivity" + } + private lateinit var aMap: AMap private lateinit var id: String @@ -79,25 +88,24 @@ ) ) ) - aMap.moveCamera(CameraUpdateFactory.zoomTo(15.toFloat())) + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) + //设置起点 + addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) + //设置终点 + addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) //瞄点画线 val routeJson = detailData.routes!! if (routeJson.isEmpty()) { return@Observer } - val pointArray = routeJson - .replace("[[", "") - .replace("]]", "") - .split("],[") - //设置起点 - addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) - //设置终点 - addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] + Log.d(Tag, "路线: $routeJson") + val type = object : TypeToken>() {}.type + val routeModels = Gson().fromJson>(routeJson, type) //画线 val latLngPoints: ArrayList = ArrayList() - pointArray.forEach { point -> - val split = point.split(",") - latLngPoints.add(LatLng(split[1].toDouble(), split[0].toDouble())) + routeModels.forEach { routeModel -> + latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 9ca5f8c..5b9fbd3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -120,6 +120,8 @@ authenticateViewModel.obtainPublicKey() } + singModeView.setChangeAlphaWhenPress(true) + //修改服务器配置 changeServerConfigView.setOnClickListener { val defaultValue = SaveKeyValues.getValue( @@ -129,6 +131,7 @@ InputDialog.Builder().setContext(this) .setTitle("请输入后台服务器地址") .setDefaultValue(defaultValue) + .setHintText("请输入服务器地址") .setNegativeButton("取消") .setPositiveButton("保存") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index 306e6aa..b98e223 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -16,7 +16,6 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.aihook.alertview.library.AlertView -import com.aihook.alertview.library.OnItemClickListener import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions @@ -26,9 +25,10 @@ import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean -import com.casic.birmm.inspect.bean.InspectionBean -import com.casic.birmm.inspect.bean.LocationBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.extensions.* +import com.casic.birmm.inspect.model.NewInspectionModel +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -68,9 +68,9 @@ private lateinit var inspectionName: String private lateinit var inspectionId: String private lateinit var userDataModel: UserInfoModel.DataBean - private lateinit var inspectionBean: InspectionBean + private lateinit var model: NewInspectionModel//新建巡检数据结构模型 private lateinit var vibrator: Vibrator - private var routes: MutableList = ArrayList()//路线点集和 + private var routeList: MutableList = ArrayList()//路线点集和 private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -412,6 +412,7 @@ locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle aMap.isMyLocationEnabled = true + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } fun initEvent() { @@ -458,12 +459,14 @@ private fun menuButtonEvent() { //结束巡检 stopInspectButton.setOnClickListener { - AlertView("温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), - null, this, AlertView.Style.Alert, OnItemClickListener { _, position -> - if (position == 0) { - stopInspection() - } - }).show() + AlertView( + "温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + stopInspection() + } + }.show() } //蓝牙按钮 @@ -534,11 +537,11 @@ val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) inspectTimeView.text = completeDate - inspectionBean = InspectionBean( - currentTimeMillis, inspectionId, inspectionName, completeDate, + model = NewInspectionModel( + inspectionId, inspectionName, completeDate, "", TimeOrDateUtil.timestampToDate(currentTimeMillis), 0.0, 0.0, 0.0, 0.0, - "", userDataModel.name + "", userDataModel.name!! ) startInspection() } @@ -550,42 +553,55 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - inspectionBean = gson.fromJson(currentInspection, InspectionBean::class.java) + val localBean = gson.fromJson(currentInspection, InspectionLocalBean::class.java) + model = NewInspectionModel( + localBean.inspectionId, localBean.name, localBean.startTime, "", localBean.date, + localBean.startLng, localBean.startLat, 0.0, 0.0, + localBean.routes, localBean.user + ) "欢迎回来，继续未完成巡检".show(this) startInspection() } } /** - * 开始巡检 - * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean + * 开始巡检，获取坐标 * */ private fun startInspection() { - Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { - aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) - if (routes.size <= 2) { - routes.add(LocationBean(it.longitude, it.latitude)) +// Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") + // 保存最新的一次位置，sp不支持保存double + SaveKeyValues.putValue(Constant.CURRENT_LONGITUDE, it.longitude.toString()) + SaveKeyValues.putValue(Constant.CURRENT_LATITUDE, it.latitude.toString()) + //设置起始经纬度 + if (model.startLng == 0.0 || model.startLat == 0.0) { + model.startLng = it.longitude + model.startLat = it.latitude + } + // 包装routes + if (routeList.size <= 2) { + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } else { //计算上一个点和当前点的距离 - val last = routes.size - 1 + val last = routeList.size - 1 val distance = AMapUtils.calculateLineDistance( - LatLng(routes[last].lat, routes[last].lng), + LatLng(routeList[last].lat, routeList[last].lng), LatLng(it.latitude, it.longitude) ) if (distance >= 10) { - routes.add(LocationBean(it.longitude, it.latitude)) - } else { - Log.d(Tag, "距离太近，无需添加路线点--->$last") + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } } - inspectionBean.routes = gson.toJson(routes) - if (inspectionBean.startLng == 0.0) { - inspectionBean.startLng = it.longitude - inspectionBean.startLat = it.latitude - } + model.routes = gson.toJson(routeList) +// Log.d(Tag, gson.toJson(routeList)) //根据定位时间间隔不停的覆盖保存巡检记录 - SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(inspectionBean)) + SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(model)) } } @@ -594,59 +610,55 @@ * 不管是手动结束还是页面销毁导致的结束，都保存巡检数据 * */ private fun stopInspection() { - LocationHelper.obtainCurrentLocation(this, object : ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation) { - routes.add( - LocationBean(aMapLocation.longitude, aMapLocation.latitude) - ) - /** - * 提交数据到后台 - * 上传成功之后finish当前页面并提示 - * 提交失败按照保存本地的逻辑走 - * - * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 - * */ - if (OtherUtils.isNetworkConnected(this@MapActivity)) { - addInspectionViewModel.addInspection( - id = inspectionBean.serverMainId, - name = inspectionBean.name, - startTime = inspectionBean.startTime, - endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), - date = inspectionBean.date, - startLng = inspectionBean.startLng, - startLat = inspectionBean.startLat, - endLng = aMapLocation.longitude, - endLat = aMapLocation.latitude, - routes = gson.toJson(routes), - user = userDataModel.name!! - ) - addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> - if (model.code == 200) { - "巡检记录保存成功".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) - } else { - //有网但是因为别的情况导致提交失败 - "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - } - finish() - }) - addInspectionViewModel.loadState.observe(this@MapActivity, Observer { - when (it) { - is LoadState.Loading -> { - OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") - } - else -> OtherUtils.dismissLoadingDialog() - } - }) + /** + * 提交数据到后台 + * 上传成功之后finish当前页面并提示 + * 提交失败按照保存本地的逻辑走 + * + * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 + * */ + if (OtherUtils.isNetworkConnected(this@MapActivity)) { + val endLng = SaveKeyValues.getValue(Constant.CURRENT_LONGITUDE, "0.0") as String + val endLat = SaveKeyValues.getValue(Constant.CURRENT_LATITUDE, "0.0") as String + + addInspectionViewModel.addInspection( + id = model.id, + name = model.name, + startTime = model.startTime, + endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), + date = model.date, + startLng = model.startLng, + startLat = model.startLat, + endLng = endLng.toDouble(), + endLat = endLat.toDouble(), + routes = model.routes, + user = userDataModel.name!! + ) + addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> + if (model.code == 200) { + "巡检记录保存成功".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) } else { - //无网导致提交失败 + //有网但是因为别的情况导致提交失败 "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - finish() } - } - }) + finish() + }) + addInspectionViewModel.loadState.observe(this@MapActivity, Observer { + when (it) { + is LoadState.Loading -> { + OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") + } + else -> OtherUtils.dismissLoadingDialog() + } + }) + } else { + //无网导致提交失败 + "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + finish() + } } /***以下是地图生命周期管理************************************************************************/ @@ -669,7 +681,7 @@ override fun onDestroy() { cancel() super.onDestroy() - stopInspection() +// stopInspection() BLEManager.disConnectDevice() mapView.onDestroy() } diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..0e98e9d --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java deleted file mode 100644 index d330f9e..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/InspectionBean.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.casic.birmm.inspect.bean; - -import org.greenrobot.greendao.annotation.Entity; -import org.greenrobot.greendao.annotation.Generated; -import org.greenrobot.greendao.annotation.Id; - -//实体类必须是java的，因为GreenDao暂时不支持Kotlin -@Entity -public class InspectionBean { - @Id(autoincrement = true) - private Long id;//本地数据库主键ID - - private String serverMainId; //服务器数据库主键id - private String name; // 巡检标签 - private String startTime; //开始事件 - private String endTime; // 结束时间 - private String date; // 日期 - private double startLng; // 开始经度 - private double startLat; // 开始纬度 - private double endLng; // 结束经度 - private double endLat; // 结束维度 - private String routes; // 路线Json - private String user; // 巡检人 - - @Generated(hash = 563794757) - public InspectionBean(Long id, String serverMainId, String name, - String startTime, String endTime, String date, double startLng, - double startLat, double endLng, double endLat, String routes, - String user) { - this.id = id; - this.serverMainId = serverMainId; - this.name = name; - this.startTime = startTime; - this.endTime = endTime; - this.date = date; - this.startLng = startLng; - this.startLat = startLat; - this.endLng = endLng; - this.endLat = endLat; - this.routes = routes; - this.user = user; - } - - @Generated(hash = 752533168) - public InspectionBean() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getServerMainId() { - return this.serverMainId; - } - - public void setServerMainId(String serverMainId) { - this.serverMainId = serverMainId; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return this.startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return this.endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return this.date; - } - - public void setDate(String date) { - this.date = date; - } - - public double getStartLng() { - return this.startLng; - } - - public void setStartLng(double startLng) { - this.startLng = startLng; - } - - public double getStartLat() { - return this.startLat; - } - - public void setStartLat(double startLat) { - this.startLat = startLat; - } - - public double getEndLng() { - return this.endLng; - } - - public void setEndLng(double endLng) { - this.endLng = endLng; - } - - public double getEndLat() { - return this.endLat; - } - - public void setEndLat(double endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return this.routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } -} 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 new file mode 100644 index 0000000..218325f --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/bean/InspectionLocalBean.java @@ -0,0 +1,143 @@ +package com.casic.birmm.inspect.bean; + +import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; +import org.greenrobot.greendao.annotation.Id; + +//实体类必须是java的，因为GreenDao暂时不支持Kotlin +@Entity +public class InspectionLocalBean { + @Id(autoincrement = true) + private Long id;//本地数据库主键ID + + private String inspectionId; //巡检id + private String name; // 巡检标签 + private String startTime; //开始事件 + private String endTime; // 结束时间 + private String date; // 日期 + private double startLng; // 开始经度 + private double startLat; // 开始纬度 + private double endLng; // 结束经度 + private double endLat; // 结束维度 + private String routes; // 路线Json + private String user; // 巡检人 + + @Generated(hash = 498062561) + public InspectionLocalBean(Long id, String inspectionId, String name, + String startTime, String endTime, String date, double startLng, + double startLat, double endLng, double endLat, String routes, + String user) { + this.id = id; + this.inspectionId = inspectionId; + this.name = name; + this.startTime = startTime; + this.endTime = endTime; + this.date = date; + this.startLng = startLng; + this.startLat = startLat; + this.endLng = endLng; + this.endLat = endLat; + this.routes = routes; + this.user = user; + } + + @Generated(hash = 1723309698) + public InspectionLocalBean() { + } + + 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 String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return this.endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDate() { + return this.date; + } + + public void setDate(String date) { + this.date = date; + } + + public double getStartLng() { + return this.startLng; + } + + public void setStartLng(double startLng) { + this.startLng = startLng; + } + + public double getStartLat() { + return this.startLat; + } + + public void setStartLat(double startLat) { + this.startLat = startLat; + } + + public double getEndLng() { + return this.endLng; + } + + public void setEndLng(double endLng) { + this.endLng = endLng; + } + + public double getEndLat() { + return this.endLat; + } + + public void setEndLat(double endLat) { + this.endLat = endLat; + } + + public String getRoutes() { + return this.routes; + } + + public void setRoutes(String routes) { + this.routes = routes; + } + + public String getUser() { + return this.user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java b/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java deleted file mode 100644 index ebcac7c..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/bean/LocationBean.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.birmm.inspect.bean; - -public class LocationBean { - private double lng; - private double lat; - - public LocationBean(double lng, double lat) { - this.lng = lng; - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } -} 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 a07c566..4139fe8 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 @@ -21,13 +21,13 @@ /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { - InspectionBeanDao.createTable(db, ifNotExists); + InspectionLocalBeanDao.createTable(db, ifNotExists); TaskEventBeanDao.createTable(db, ifNotExists); } /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { - InspectionBeanDao.dropTable(db, ifExists); + InspectionLocalBeanDao.dropTable(db, ifExists); TaskEventBeanDao.dropTable(db, ifExists); } @@ -47,7 +47,7 @@ public DaoMaster(Database db) { super(db, SCHEMA_VERSION); - registerDaoClass(InspectionBeanDao.class); + registerDaoClass(InspectionLocalBeanDao.class); registerDaoClass(TaskEventBeanDao.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 346e192..a823208 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 @@ -8,10 +8,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.birmm.inspect.bean.InspectionBean; +import com.casic.birmm.inspect.bean.InspectionLocalBean; import com.casic.birmm.inspect.bean.TaskEventBean; -import com.casic.birmm.inspect.greendao.InspectionBeanDao; +import com.casic.birmm.inspect.greendao.InspectionLocalBeanDao; import com.casic.birmm.inspect.greendao.TaskEventBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. @@ -23,36 +23,36 @@ */ public class DaoSession extends AbstractDaoSession { - private final DaoConfig inspectionBeanDaoConfig; + private final DaoConfig inspectionLocalBeanDaoConfig; private final DaoConfig taskEventBeanDaoConfig; - private final InspectionBeanDao inspectionBeanDao; + private final InspectionLocalBeanDao inspectionLocalBeanDao; private final TaskEventBeanDao taskEventBeanDao; public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); - inspectionBeanDaoConfig = daoConfigMap.get(InspectionBeanDao.class).clone(); - inspectionBeanDaoConfig.initIdentityScope(type); + inspectionLocalBeanDaoConfig = daoConfigMap.get(InspectionLocalBeanDao.class).clone(); + inspectionLocalBeanDaoConfig.initIdentityScope(type); taskEventBeanDaoConfig = daoConfigMap.get(TaskEventBeanDao.class).clone(); taskEventBeanDaoConfig.initIdentityScope(type); - inspectionBeanDao = new InspectionBeanDao(inspectionBeanDaoConfig, this); + inspectionLocalBeanDao = new InspectionLocalBeanDao(inspectionLocalBeanDaoConfig, this); taskEventBeanDao = new TaskEventBeanDao(taskEventBeanDaoConfig, this); - registerDao(InspectionBean.class, inspectionBeanDao); + registerDao(InspectionLocalBean.class, inspectionLocalBeanDao); registerDao(TaskEventBean.class, taskEventBeanDao); } public void clear() { - inspectionBeanDaoConfig.clearIdentityScope(); + inspectionLocalBeanDaoConfig.clearIdentityScope(); taskEventBeanDaoConfig.clearIdentityScope(); } - public InspectionBeanDao getInspectionBeanDao() { - return inspectionBeanDao; + public InspectionLocalBeanDao getInspectionLocalBeanDao() { + return inspectionLocalBeanDao; } public TaskEventBeanDao getTaskEventBeanDao() { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java deleted file mode 100644 index b7077a3..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionBeanDao.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.casic.birmm.inspect.greendao; - -import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; - -import org.greenrobot.greendao.AbstractDao; -import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; -import org.greenrobot.greendao.database.Database; -import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.birmm.inspect.bean.InspectionBean; - -// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** - * DAO for table "INSPECTION_BEAN". -*/ -public class InspectionBeanDao extends AbstractDao { - - public static final String TABLENAME = "INSPECTION_BEAN"; - - /** - * Properties of entity InspectionBean.
- * 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 ServerMainId = new Property(1, String.class, "serverMainId", false, "SERVER_MAIN_ID"); - public final static Property Name = new Property(2, String.class, "name", false, "NAME"); - public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); - public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); - public final static Property Date = new Property(5, String.class, "date", false, "DATE"); - public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); - public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); - public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); - public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); - public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); - public final static Property User = new Property(11, String.class, "user", false, "USER"); - } - - - public InspectionBeanDao(DaoConfig config) { - super(config); - } - - public InspectionBeanDao(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 + "\"INSPECTION_BEAN\" (" + // - "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id - "\"SERVER_MAIN_ID\" TEXT," + // 1: serverMainId - "\"NAME\" TEXT," + // 2: name - "\"START_TIME\" TEXT," + // 3: startTime - "\"END_TIME\" TEXT," + // 4: endTime - "\"DATE\" TEXT," + // 5: date - "\"START_LNG\" REAL NOT NULL ," + // 6: startLng - "\"START_LAT\" REAL NOT NULL ," + // 7: startLat - "\"END_LNG\" REAL NOT NULL ," + // 8: endLng - "\"END_LAT\" REAL NOT NULL ," + // 9: endLat - "\"ROUTES\" TEXT," + // 10: routes - "\"USER\" TEXT);"); // 11: user - } - - /** Drops the underlying database table. */ - public static void dropTable(Database db, boolean ifExists) { - String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_BEAN\""; - db.execSQL(sql); - } - - @Override - protected final void bindValues(DatabaseStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - protected final void bindValues(SQLiteStatement stmt, InspectionBean entity) { - stmt.clearBindings(); - - Long id = entity.getId(); - if (id != null) { - stmt.bindLong(1, id); - } - - String serverMainId = entity.getServerMainId(); - if (serverMainId != null) { - stmt.bindString(2, serverMainId); - } - - String name = entity.getName(); - if (name != null) { - stmt.bindString(3, name); - } - - String startTime = entity.getStartTime(); - if (startTime != null) { - stmt.bindString(4, startTime); - } - - String endTime = entity.getEndTime(); - if (endTime != null) { - stmt.bindString(5, endTime); - } - - String date = entity.getDate(); - if (date != null) { - stmt.bindString(6, date); - } - stmt.bindDouble(7, entity.getStartLng()); - stmt.bindDouble(8, entity.getStartLat()); - stmt.bindDouble(9, entity.getEndLng()); - stmt.bindDouble(10, entity.getEndLat()); - - String routes = entity.getRoutes(); - if (routes != null) { - stmt.bindString(11, routes); - } - - String user = entity.getUser(); - if (user != null) { - stmt.bindString(12, user); - } - } - - @Override - public Long readKey(Cursor cursor, int offset) { - return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } - - @Override - public InspectionBean readEntity(Cursor cursor, int offset) { - InspectionBean entity = new InspectionBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // serverMainId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date - cursor.getDouble(offset + 6), // startLng - cursor.getDouble(offset + 7), // startLat - cursor.getDouble(offset + 8), // endLng - cursor.getDouble(offset + 9), // endLat - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user - ); - return entity; - } - - @Override - public void readEntity(Cursor cursor, InspectionBean entity, int offset) { - entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); - entity.setServerMainId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); - entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); - entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); - entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); - entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); - entity.setStartLng(cursor.getDouble(offset + 6)); - entity.setStartLat(cursor.getDouble(offset + 7)); - entity.setEndLng(cursor.getDouble(offset + 8)); - entity.setEndLat(cursor.getDouble(offset + 9)); - entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); - entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - - @Override - protected final Long updateKeyAfterInsert(InspectionBean entity, long rowId) { - entity.setId(rowId); - return rowId; - } - - @Override - public Long getKey(InspectionBean entity) { - if(entity != null) { - return entity.getId(); - } else { - return null; - } - } - - @Override - public boolean hasKey(InspectionBean entity) { - return entity.getId() != null; - } - - @Override - protected final boolean isEntityUpdateable() { - return true; - } - -} 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 new file mode 100644 index 0000000..c13ddcc --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -0,0 +1,237 @@ +package com.casic.birmm.inspect.greendao; + +import android.database.Cursor; +import android.database.sqlite.SQLiteStatement; + +import org.greenrobot.greendao.AbstractDao; +import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; +import org.greenrobot.greendao.database.Database; +import org.greenrobot.greendao.database.DatabaseStatement; + +import com.casic.birmm.inspect.bean.InspectionLocalBean; + +// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. +/** + * DAO for table "INSPECTION_LOCAL_BEAN". +*/ +public class InspectionLocalBeanDao extends AbstractDao { + + public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; + + /** + * Properties of entity InspectionLocalBean.
+ * 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 Name = new Property(2, String.class, "name", false, "NAME"); + public final static Property StartTime = new Property(3, String.class, "startTime", false, "START_TIME"); + public final static Property EndTime = new Property(4, String.class, "endTime", false, "END_TIME"); + public final static Property Date = new Property(5, String.class, "date", false, "DATE"); + public final static Property StartLng = new Property(6, double.class, "startLng", false, "START_LNG"); + public final static Property StartLat = new Property(7, double.class, "startLat", false, "START_LAT"); + public final static Property EndLng = new Property(8, double.class, "endLng", false, "END_LNG"); + public final static Property EndLat = new Property(9, double.class, "endLat", false, "END_LAT"); + public final static Property Routes = new Property(10, String.class, "routes", false, "ROUTES"); + public final static Property User = new Property(11, String.class, "user", false, "USER"); + } + + + public InspectionLocalBeanDao(DaoConfig config) { + super(config); + } + + public InspectionLocalBeanDao(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 + "\"INSPECTION_LOCAL_BEAN\" (" + // + "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id + "\"INSPECTION_ID\" TEXT," + // 1: inspectionId + "\"NAME\" TEXT," + // 2: name + "\"START_TIME\" TEXT," + // 3: startTime + "\"END_TIME\" TEXT," + // 4: endTime + "\"DATE\" TEXT," + // 5: date + "\"START_LNG\" REAL NOT NULL ," + // 6: startLng + "\"START_LAT\" REAL NOT NULL ," + // 7: startLat + "\"END_LNG\" REAL NOT NULL ," + // 8: endLng + "\"END_LAT\" REAL NOT NULL ," + // 9: endLat + "\"ROUTES\" TEXT," + // 10: routes + "\"USER\" TEXT);"); // 11: user + } + + /** Drops the underlying database table. */ + public static void dropTable(Database db, boolean ifExists) { + String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; + db.execSQL(sql); + } + + @Override + protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean 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); + } + + String name = entity.getName(); + if (name != null) { + stmt.bindString(3, name); + } + + String startTime = entity.getStartTime(); + if (startTime != null) { + stmt.bindString(4, startTime); + } + + String endTime = entity.getEndTime(); + if (endTime != null) { + stmt.bindString(5, endTime); + } + + String date = entity.getDate(); + if (date != null) { + stmt.bindString(6, date); + } + stmt.bindDouble(7, entity.getStartLng()); + stmt.bindDouble(8, entity.getStartLat()); + stmt.bindDouble(9, entity.getEndLng()); + stmt.bindDouble(10, entity.getEndLat()); + + String routes = entity.getRoutes(); + if (routes != null) { + stmt.bindString(11, routes); + } + + String user = entity.getUser(); + if (user != null) { + stmt.bindString(12, user); + } + } + + @Override + public Long readKey(Cursor cursor, int offset) { + return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); + } + + @Override + public InspectionLocalBean readEntity(Cursor cursor, int offset) { + InspectionLocalBean entity = new InspectionLocalBean( // + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // startTime + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // endTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // date + cursor.getDouble(offset + 6), // startLng + cursor.getDouble(offset + 7), // startLat + cursor.getDouble(offset + 8), // endLng + cursor.getDouble(offset + 9), // endLat + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // routes + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // user + ); + return entity; + } + + @Override + public void readEntity(Cursor cursor, InspectionLocalBean 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.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); + entity.setStartTime(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); + entity.setEndTime(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); + entity.setDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); + entity.setStartLng(cursor.getDouble(offset + 6)); + entity.setStartLat(cursor.getDouble(offset + 7)); + entity.setEndLng(cursor.getDouble(offset + 8)); + entity.setEndLat(cursor.getDouble(offset + 9)); + entity.setRoutes(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); + entity.setUser(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); + } + + @Override + protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { + entity.setId(rowId); + return rowId; + } + + @Override + public Long getKey(InspectionLocalBean entity) { + if(entity != null) { + return entity.getId(); + } else { + return null; + } + } + + @Override + public boolean hasKey(InspectionLocalBean entity) { + return entity.getId() != null; + } + + @Override + protected final boolean isEntityUpdateable() { + return true; + } + +} diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt new file mode 100644 index 0000000..4c56beb --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewInspectionModel.kt @@ -0,0 +1,15 @@ +package com.casic.birmm.inspect.model + +class NewInspectionModel( + var id: String, + var name: String, + var startTime: String, + var endTime: String, + var date: String, + var startLng: Double, + var startLat: Double, + var endLng: Double, + var endLat: Double, + var routes: String, + var user: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt new file mode 100644 index 0000000..ddc9ed4 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/model/NewRouteModel.kt @@ -0,0 +1,10 @@ +package com.casic.birmm.inspect.model + +internal class NewRouteModel { + /** + * lat : 39.917433 + * lng : 116.269525 + */ + var lat = 0.0 + var lng = 0.0 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt index ab0ce47..d5ff9c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/Constant.kt @@ -34,6 +34,8 @@ const val AUTO_RECORD = "isRecordLog" const val INSPECTION_OBJECT = "inspectionObject" const val INSPECTION_COMPLETED = "inspectionCompleted" + const val CURRENT_LONGITUDE = "currentLongitude" + const val CURRENT_LATITUDE = "currentLatitude" val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 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 c7fba84..893a376 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 @@ -1,7 +1,7 @@ package com.casic.birmm.inspect.utils import com.casic.birmm.inspect.base.BaseApplication -import com.casic.birmm.inspect.bean.InspectionBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.bean.TaskEventBean import com.casic.birmm.inspect.greendao.TaskEventBeanDao import com.casic.birmm.inspect.model.TaskRecordModel @@ -18,36 +18,36 @@ /** * 保存巡检记录到本地 * */ - fun insertData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.insert(bean) + fun insertData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.insert(bean) } /** * 删除本地巡检记录 * */ - fun deleteData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.delete(bean) + fun deleteData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.delete(bean) } /** * 删除全部数据 */ fun deleteAllInspection() { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.deleteAll() + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.deleteAll() } /** * 更新数据库 */ - fun updateData(bean: InspectionBean) { - BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao.update(bean) + fun updateData(bean: InspectionLocalBean) { + BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao.update(bean) } /** * 查询所有数据 */ - fun queryAllInspection(): MutableList? { - return BaseApplication.obtainInstance().obtainDaoSession().inspectionBeanDao?.queryBuilder() + fun queryAllInspection(): MutableList? { + return BaseApplication.obtainInstance().obtainDaoSession().inspectionLocalBeanDao?.queryBuilder() ?.build()?.list() } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt index b64d2d1..7929a38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/SaveKeyValues.kt @@ -29,15 +29,15 @@ is Int -> { editor.putInt(key, obj).apply() } + is Long -> { + editor.putLong(key, obj).apply() + } is Boolean -> { editor.putBoolean(key, obj).apply() } is Float -> { editor.putFloat(key, obj).apply() } - is Long -> { - editor.putLong(key, obj).apply() - } else -> { editor.putString(key, obj.toString()).apply() } @@ -59,15 +59,15 @@ is Int -> { sharedPreferences.getInt(key, (defaultObject as Int?)!!) } + is Long -> { + sharedPreferences.getLong(key, (defaultObject as Long?)!!) + } is Boolean -> { sharedPreferences.getBoolean(key, (defaultObject as Boolean?)!!) } is Float -> { sharedPreferences.getFloat(key, (defaultObject as Float?)!!) } - is Long -> { - sharedPreferences.getLong(key, (defaultObject as Long?)!!) - } else -> { sharedPreferences.getString(key, null) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index 9d629c5..89a854e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -3,6 +3,7 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.Observer @@ -16,10 +17,13 @@ import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R import com.casic.birmm.inspect.extensions.show +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.utils.OtherUtils import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -28,8 +32,13 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel + class InspectRouteActivity : AppCompatActivity(), CoroutineScope by MainScope() { + companion object { + private const val Tag = "InspectRouteActivity" + } + private lateinit var aMap: AMap private lateinit var id: String @@ -79,25 +88,24 @@ ) ) ) - aMap.moveCamera(CameraUpdateFactory.zoomTo(15.toFloat())) + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) + //设置起点 + addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) + //设置终点 + addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) //瞄点画线 val routeJson = detailData.routes!! if (routeJson.isEmpty()) { return@Observer } - val pointArray = routeJson - .replace("[[", "") - .replace("]]", "") - .split("],[") - //设置起点 - addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) - //设置终点 - addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) + //[{"lat":39.917433,"lng":116.269525},{"lat":39.917433,"lng":116.269525}] + Log.d(Tag, "路线: $routeJson") + val type = object : TypeToken>() {}.type + val routeModels = Gson().fromJson>(routeJson, type) //画线 val latLngPoints: ArrayList = ArrayList() - pointArray.forEach { point -> - val split = point.split(",") - latLngPoints.add(LatLng(split[1].toDouble(), split[0].toDouble())) + routeModels.forEach { routeModel -> + latLngPoints.add(LatLng(routeModel.lat, routeModel.lng)) } aMap.addPolyline( PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 9ca5f8c..5b9fbd3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -120,6 +120,8 @@ authenticateViewModel.obtainPublicKey() } + singModeView.setChangeAlphaWhenPress(true) + //修改服务器配置 changeServerConfigView.setOnClickListener { val defaultValue = SaveKeyValues.getValue( @@ -129,6 +131,7 @@ InputDialog.Builder().setContext(this) .setTitle("请输入后台服务器地址") .setDefaultValue(defaultValue) + .setHintText("请输入服务器地址") .setNegativeButton("取消") .setPositiveButton("保存") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index 306e6aa..b98e223 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -16,7 +16,6 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.aihook.alertview.library.AlertView -import com.aihook.alertview.library.OnItemClickListener import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions @@ -26,9 +25,10 @@ import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean -import com.casic.birmm.inspect.bean.InspectionBean -import com.casic.birmm.inspect.bean.LocationBean +import com.casic.birmm.inspect.bean.InspectionLocalBean import com.casic.birmm.inspect.extensions.* +import com.casic.birmm.inspect.model.NewInspectionModel +import com.casic.birmm.inspect.model.NewRouteModel import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -68,9 +68,9 @@ private lateinit var inspectionName: String private lateinit var inspectionId: String private lateinit var userDataModel: UserInfoModel.DataBean - private lateinit var inspectionBean: InspectionBean + private lateinit var model: NewInspectionModel//新建巡检数据结构模型 private lateinit var vibrator: Vibrator - private var routes: MutableList = ArrayList()//路线点集和 + private var routeList: MutableList = ArrayList()//路线点集和 private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -412,6 +412,7 @@ locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle aMap.isMyLocationEnabled = true + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } fun initEvent() { @@ -458,12 +459,14 @@ private fun menuButtonEvent() { //结束巡检 stopInspectButton.setOnClickListener { - AlertView("温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), - null, this, AlertView.Style.Alert, OnItemClickListener { _, position -> - if (position == 0) { - stopInspection() - } - }).show() + AlertView( + "温馨提示", "确定结束巡检吗？", "取消", arrayOf("确定"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + stopInspection() + } + }.show() } //蓝牙按钮 @@ -534,11 +537,11 @@ val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) inspectTimeView.text = completeDate - inspectionBean = InspectionBean( - currentTimeMillis, inspectionId, inspectionName, completeDate, + model = NewInspectionModel( + inspectionId, inspectionName, completeDate, "", TimeOrDateUtil.timestampToDate(currentTimeMillis), 0.0, 0.0, 0.0, 0.0, - "", userDataModel.name + "", userDataModel.name!! ) startInspection() } @@ -550,42 +553,55 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - inspectionBean = gson.fromJson(currentInspection, InspectionBean::class.java) + val localBean = gson.fromJson(currentInspection, InspectionLocalBean::class.java) + model = NewInspectionModel( + localBean.inspectionId, localBean.name, localBean.startTime, "", localBean.date, + localBean.startLng, localBean.startLat, 0.0, 0.0, + localBean.routes, localBean.user + ) "欢迎回来，继续未完成巡检".show(this) startInspection() } } /** - * 开始巡检 - * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean + * 开始巡检，获取坐标 * */ private fun startInspection() { - Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { - aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) - if (routes.size <= 2) { - routes.add(LocationBean(it.longitude, it.latitude)) +// Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") + // 保存最新的一次位置，sp不支持保存double + SaveKeyValues.putValue(Constant.CURRENT_LONGITUDE, it.longitude.toString()) + SaveKeyValues.putValue(Constant.CURRENT_LATITUDE, it.latitude.toString()) + //设置起始经纬度 + if (model.startLng == 0.0 || model.startLat == 0.0) { + model.startLng = it.longitude + model.startLat = it.latitude + } + // 包装routes + if (routeList.size <= 2) { + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } else { //计算上一个点和当前点的距离 - val last = routes.size - 1 + val last = routeList.size - 1 val distance = AMapUtils.calculateLineDistance( - LatLng(routes[last].lat, routes[last].lng), + LatLng(routeList[last].lat, routeList[last].lng), LatLng(it.latitude, it.longitude) ) if (distance >= 10) { - routes.add(LocationBean(it.longitude, it.latitude)) - } else { - Log.d(Tag, "距离太近，无需添加路线点--->$last") + val route = NewRouteModel() + route.lng = it.longitude + route.lat = it.latitude + routeList.add(route) } } - inspectionBean.routes = gson.toJson(routes) - if (inspectionBean.startLng == 0.0) { - inspectionBean.startLng = it.longitude - inspectionBean.startLat = it.latitude - } + model.routes = gson.toJson(routeList) +// Log.d(Tag, gson.toJson(routeList)) //根据定位时间间隔不停的覆盖保存巡检记录 - SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(inspectionBean)) + SaveKeyValues.putValue(Constant.INSPECTION_OBJECT, gson.toJson(model)) } } @@ -594,59 +610,55 @@ * 不管是手动结束还是页面销毁导致的结束，都保存巡检数据 * */ private fun stopInspection() { - LocationHelper.obtainCurrentLocation(this, object : ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation) { - routes.add( - LocationBean(aMapLocation.longitude, aMapLocation.latitude) - ) - /** - * 提交数据到后台 - * 上传成功之后finish当前页面并提示 - * 提交失败按照保存本地的逻辑走 - * - * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 - * */ - if (OtherUtils.isNetworkConnected(this@MapActivity)) { - addInspectionViewModel.addInspection( - id = inspectionBean.serverMainId, - name = inspectionBean.name, - startTime = inspectionBean.startTime, - endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), - date = inspectionBean.date, - startLng = inspectionBean.startLng, - startLat = inspectionBean.startLat, - endLng = aMapLocation.longitude, - endLat = aMapLocation.latitude, - routes = gson.toJson(routes), - user = userDataModel.name!! - ) - addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> - if (model.code == 200) { - "巡检记录保存成功".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) - } else { - //有网但是因为别的情况导致提交失败 - "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) - SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - } - finish() - }) - addInspectionViewModel.loadState.observe(this@MapActivity, Observer { - when (it) { - is LoadState.Loading -> { - OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") - } - else -> OtherUtils.dismissLoadingDialog() - } - }) + /** + * 提交数据到后台 + * 上传成功之后finish当前页面并提示 + * 提交失败按照保存本地的逻辑走 + * + * 如果保存到本地，则需要设置标识位，然后finish当前页面并提示 + * */ + if (OtherUtils.isNetworkConnected(this@MapActivity)) { + val endLng = SaveKeyValues.getValue(Constant.CURRENT_LONGITUDE, "0.0") as String + val endLat = SaveKeyValues.getValue(Constant.CURRENT_LATITUDE, "0.0") as String + + addInspectionViewModel.addInspection( + id = model.id, + name = model.name, + startTime = model.startTime, + endTime = TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis()), + date = model.date, + startLng = model.startLng, + startLat = model.startLat, + endLng = endLng.toDouble(), + endLat = endLat.toDouble(), + routes = model.routes, + user = userDataModel.name!! + ) + addInspectionViewModel.resultModel.observe(this@MapActivity, Observer { model -> + if (model.code == 200) { + "巡检记录保存成功".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) } else { - //无网导致提交失败 + //有网但是因为别的情况导致提交失败 "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) - finish() } - } - }) + finish() + }) + addInspectionViewModel.loadState.observe(this@MapActivity, Observer { + when (it) { + is LoadState.Loading -> { + OtherUtils.showLoadingDialog(this@MapActivity, "保存中，请稍后...") + } + else -> OtherUtils.dismissLoadingDialog() + } + }) + } else { + //无网导致提交失败 + "巡检记录保存失败，已替您缓存到本地".show(this@MapActivity) + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + finish() + } } /***以下是地图生命周期管理************************************************************************/ @@ -669,7 +681,7 @@ override fun onDestroy() { cancel() super.onDestroy() - stopInspection() +// stopInspection() BLEManager.disConnectDevice() mapView.onDestroy() } diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..0e98e9d --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 30b2e5e..cecc6bb 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -77,14 +77,28 @@ app:qmui_borderColor="@color/mainThemeColor" app:qmui_radius="20dp" /> - + + + android:layout_marginBottom="30dp" + android:background="@drawable/ic_settings" /> + \ No newline at end of file