diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt index df6adb5..ec7ef43 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt @@ -1,14 +1,7 @@ package com.casic.br.ktd.utils -import android.Manifest import android.content.Context -import android.content.pm.PackageManager -import android.location.Location -import android.location.LocationListener -import android.location.LocationManager -import android.os.Bundle import android.util.Log -import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -34,36 +27,14 @@ locationOption.isLocationCacheEnable = true //可选，设置是否使用缓存定位，默认为true } - fun obtainLocation(context: Context, listener: ILocationListener) { - if (ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_FINE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED - ) { - return - } - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - //位置变化时更新位置 - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, - 3000, 5f, object : LocationListener { - override fun onLocationChanged(location: Location) { - listener.onLocationGet(location) - } - - override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {} - override fun onProviderEnabled(provider: String) {} - override fun onProviderDisabled(provider: String) {} - }) - } - /** * 高德sdk定位 */ - fun obtainLocationByGD(context: Context?, listener: ILocationListener) { + fun obtainLocation( + context: Context?, listener: ILocationListener, isOnceLocation: Boolean + ) { locationClient = AMapLocationClient(context) + locationOption.isOnceLocation = isOnceLocation //给定位客户端对象设置定位参数 locationClient.setLocationOption(locationOption) //设置定位回调监听 @@ -88,8 +59,6 @@ } interface ILocationListener { - fun onLocationGet(location: Location?) //GPS定位数据 - - fun onAMapLocationGet(aMapLocation: AMapLocation?) //高德定位数据 + fun onAMapLocationGet(aMapLocation: AMapLocation) //高德定位数据 } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt index df6adb5..ec7ef43 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt @@ -1,14 +1,7 @@ package com.casic.br.ktd.utils -import android.Manifest import android.content.Context -import android.content.pm.PackageManager -import android.location.Location -import android.location.LocationListener -import android.location.LocationManager -import android.os.Bundle import android.util.Log -import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -34,36 +27,14 @@ locationOption.isLocationCacheEnable = true //可选，设置是否使用缓存定位，默认为true } - fun obtainLocation(context: Context, listener: ILocationListener) { - if (ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_FINE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED - ) { - return - } - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - //位置变化时更新位置 - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, - 3000, 5f, object : LocationListener { - override fun onLocationChanged(location: Location) { - listener.onLocationGet(location) - } - - override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {} - override fun onProviderEnabled(provider: String) {} - override fun onProviderDisabled(provider: String) {} - }) - } - /** * 高德sdk定位 */ - fun obtainLocationByGD(context: Context?, listener: ILocationListener) { + fun obtainLocation( + context: Context?, listener: ILocationListener, isOnceLocation: Boolean + ) { locationClient = AMapLocationClient(context) + locationOption.isOnceLocation = isOnceLocation //给定位客户端对象设置定位参数 locationClient.setLocationOption(locationOption) //设置定位回调监听 @@ -88,8 +59,6 @@ } interface ILocationListener { - fun onLocationGet(location: Location?) //GPS定位数据 - - fun onAMapLocationGet(aMapLocation: AMapLocation?) //高德定位数据 + fun onAMapLocationGet(aMapLocation: AMapLocation) //高德定位数据 } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index 342ac55..811e69d 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Color import android.graphics.PixelFormat -import android.location.Location import android.os.Bundle import android.os.Handler import android.os.Message @@ -27,7 +26,6 @@ import com.casic.br.ktd.R import com.casic.br.ktd.databinding.ActivityInspectionBinding import com.casic.br.ktd.extensions.* -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.ChartPointModel import com.casic.br.ktd.model.SensorDataModel import com.casic.br.ktd.netty.tcp.SocketManager @@ -84,7 +82,7 @@ private var previewHandle = -1 private var selectChannel = -1 private var selectStreamType = -1 - private var returnUserID = -1 + private var returnUserId = -1 private var aChannelNum = 0 private var startAChannel = 0 private var dChannelNum = 0 @@ -100,9 +98,6 @@ //巡检是否已开始 private var isStartInspect = false - //车速 - private var speed: Float = 0.0f - //云台转动速度 private var selectedSpeed = 0 @@ -122,7 +117,6 @@ private lateinit var pointViewModel: PointViewModel private lateinit var fileViewModel: FileViewModel private lateinit var alarmViewModel: AlarmViewModel - private lateinit var alarmParam: AlarmParam private var taskId = "" private var deviceId = "" private var dataModel: SensorDataModel? = null @@ -179,18 +173,80 @@ gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String + //初始化任务 + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + taskViewModel.addTask( + carId, + aMapLocation.latitude.toString(), + aMapLocation.longitude.toString(), + taskTitle + ) + } + }, true) taskViewModel.addTaskResult.observe(this) { if (it.code == 200) { taskId = it.data.toString() } } + + var lat = "" + var lng = "" + var address = "" + var speed = 0.0f fileViewModel.resultModel.observe(this) { if (it.code == 200) { - if (alarmParam.alarmLongitude.isNotEmpty() && alarmParam.alarmLatitude.isNotEmpty()) { - alarmParam.alarmPicture = it.data - alarmViewModel.addAlarm(alarmParam) + LocationHelper.get.obtainLocation( + this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + lat = aMapLocation.longitude.toString() + lng = aMapLocation.latitude.toString() + address = aMapLocation.address + speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + dataModel?.methane.toString(), + ) + } + }, true + ) + } + } + + alarmViewModel.resultModel.observe(this) { + if (it.code == 200) { + //上传经纬度以及甲烷浓度 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" } + + pointViewModel.uploadPointDetail( + taskId, + it.data.toString(), + lat, + lng, + speed.toString(), + deviceStatus, + "1", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + address, + dataModel?.horizontal.toString(), + System.currentTimeMillis().timestampToCompleteDate() + ) } } @@ -210,18 +266,10 @@ setMapConfig(savedInstanceState) /** - * 高德定位 + * 高德周期定位 * */ - LocationHelper.get.obtainLocationByGD(this, object : LocationHelper.ILocationListener { - override fun onLocationGet(location: Location?) { - - } - - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - if (aMapLocation == null) { - "当前信号弱，无法定位".show(context) - return - } + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { val longitude = aMapLocation.longitude.toString() val latitude = aMapLocation.latitude.toString() @@ -229,29 +277,6 @@ //发送位置信息给UDP服务端 udpClient.send("$longitude, $latitude") - //设置报警点的经纬度 - alarmParam.alarmLatitude = latitude - alarmParam.alarmLongitude = longitude - - //上传经纬度以及甲烷浓度 - val deviceStatus = if (dataModel?.methaneState == "正常") { - "1" - } else { - "0" - } - pointViewModel.uploadPointDetail( - isAlarm, - latitude, - dataModel?.methane.toString(), - dataModel?.vertical.toString(), - "", - aMapLocation.speed.toString(), - deviceStatus, - dataModel?.horizontal.toString(), - longitude, - System.currentTimeMillis().timestampToCompleteDate() - ) - //速度 转为 km/h speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() binding.carSpeedView.text = String.format("${speed}Km/h") @@ -270,20 +295,29 @@ ) if (isStartInspect) { - taskViewModel.updateTask( + //上传经纬度以及甲烷浓度，普通点 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" + } + pointViewModel.uploadPointDetail( taskId, - latLng.latitude, - latLng.longitude, + "", + lat, + lng, + speed.toString(), + deviceStatus, + "0", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + aMapLocation.address, + dataModel?.horizontal.toString(), System.currentTimeMillis().timestampToCompleteDate() ) } } - }) - - //初始化任务 - taskViewModel.addTask( - carId, latlngs.last.latitude.toString(), latlngs.last.longitude.toString(), taskTitle - ) + }, false) /** * TCP初始化 @@ -567,7 +601,7 @@ //配置设备通道 try { val deviceInfo = SDKGuider.sdkGuider.devManageGuider.devList[0] - returnUserID = deviceInfo.m_lUserID + returnUserId = deviceInfo.m_lUserID aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt() startAChannel = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt() @@ -609,7 +643,7 @@ strutPlayInfo.bBlocked = 1 strutPlayInfo.hHwnd = binding.videoSurfaceView.holder previewHandle = SDKGuider.sdkGuider.devPreviewGuider.RealPlay_V40_jni( - returnUserID, strutPlayInfo, null + returnUserId, strutPlayInfo, null ) if (previewHandle < 0) { Log.d(kTag, "NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}") @@ -621,7 +655,7 @@ //打开激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.OPEN_SENSOR_COMMAND, LocaleConstant.OPEN_SENSOR_COMMAND.size ) @@ -677,7 +711,7 @@ //串口编号 serialStart.wPort = 0 val serialHandle = hkSDK.NET_DVR_SerialStart_V40( - returnUserID, serialStart + returnUserId, serialStart ) { _, _, _, _ -> } //向透明通道发送数据，水平和垂直需要分开发送 @@ -722,7 +756,7 @@ strJpeg.wPicSize = 2 val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.png" - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserId, selectChannel, strJpeg, imagePath) if (MessageCodeHub.getErrorCode() == 0) { if (!isAutoCapture) { @@ -736,7 +770,7 @@ private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.CLOSE_SENSOR_COMMAND, LocaleConstant.CLOSE_SENSOR_COMMAND.size ) @@ -797,29 +831,13 @@ String.format("${dataModel!!.vertical}$degree") binding.gasConcentrationView.text = String.format("${dataModel!!.methane}ppm·m") - //TODO 报警视频 + if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //初始化alarmParam - alarmParam = AlarmParam( - "甲烷浓度超过阈值", - "", - "", - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - "", - deviceId, - "0", - "1", - "", - dataModel!!.methane.toString(), - taskId - ) - captureImage(true) - //抓取报警时候的视频并上传 + //TODO 抓取报警时候的视频并上传 } /***折线图**************************************************************************/ diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt index df6adb5..ec7ef43 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt @@ -1,14 +1,7 @@ package com.casic.br.ktd.utils -import android.Manifest import android.content.Context -import android.content.pm.PackageManager -import android.location.Location -import android.location.LocationListener -import android.location.LocationManager -import android.os.Bundle import android.util.Log -import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -34,36 +27,14 @@ locationOption.isLocationCacheEnable = true //可选，设置是否使用缓存定位，默认为true } - fun obtainLocation(context: Context, listener: ILocationListener) { - if (ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_FINE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED - ) { - return - } - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - //位置变化时更新位置 - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, - 3000, 5f, object : LocationListener { - override fun onLocationChanged(location: Location) { - listener.onLocationGet(location) - } - - override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {} - override fun onProviderEnabled(provider: String) {} - override fun onProviderDisabled(provider: String) {} - }) - } - /** * 高德sdk定位 */ - fun obtainLocationByGD(context: Context?, listener: ILocationListener) { + fun obtainLocation( + context: Context?, listener: ILocationListener, isOnceLocation: Boolean + ) { locationClient = AMapLocationClient(context) + locationOption.isOnceLocation = isOnceLocation //给定位客户端对象设置定位参数 locationClient.setLocationOption(locationOption) //设置定位回调监听 @@ -88,8 +59,6 @@ } interface ILocationListener { - fun onLocationGet(location: Location?) //GPS定位数据 - - fun onAMapLocationGet(aMapLocation: AMapLocation?) //高德定位数据 + fun onAMapLocationGet(aMapLocation: AMapLocation) //高德定位数据 } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index 342ac55..811e69d 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Color import android.graphics.PixelFormat -import android.location.Location import android.os.Bundle import android.os.Handler import android.os.Message @@ -27,7 +26,6 @@ import com.casic.br.ktd.R import com.casic.br.ktd.databinding.ActivityInspectionBinding import com.casic.br.ktd.extensions.* -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.ChartPointModel import com.casic.br.ktd.model.SensorDataModel import com.casic.br.ktd.netty.tcp.SocketManager @@ -84,7 +82,7 @@ private var previewHandle = -1 private var selectChannel = -1 private var selectStreamType = -1 - private var returnUserID = -1 + private var returnUserId = -1 private var aChannelNum = 0 private var startAChannel = 0 private var dChannelNum = 0 @@ -100,9 +98,6 @@ //巡检是否已开始 private var isStartInspect = false - //车速 - private var speed: Float = 0.0f - //云台转动速度 private var selectedSpeed = 0 @@ -122,7 +117,6 @@ private lateinit var pointViewModel: PointViewModel private lateinit var fileViewModel: FileViewModel private lateinit var alarmViewModel: AlarmViewModel - private lateinit var alarmParam: AlarmParam private var taskId = "" private var deviceId = "" private var dataModel: SensorDataModel? = null @@ -179,18 +173,80 @@ gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String + //初始化任务 + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + taskViewModel.addTask( + carId, + aMapLocation.latitude.toString(), + aMapLocation.longitude.toString(), + taskTitle + ) + } + }, true) taskViewModel.addTaskResult.observe(this) { if (it.code == 200) { taskId = it.data.toString() } } + + var lat = "" + var lng = "" + var address = "" + var speed = 0.0f fileViewModel.resultModel.observe(this) { if (it.code == 200) { - if (alarmParam.alarmLongitude.isNotEmpty() && alarmParam.alarmLatitude.isNotEmpty()) { - alarmParam.alarmPicture = it.data - alarmViewModel.addAlarm(alarmParam) + LocationHelper.get.obtainLocation( + this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + lat = aMapLocation.longitude.toString() + lng = aMapLocation.latitude.toString() + address = aMapLocation.address + speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + dataModel?.methane.toString(), + ) + } + }, true + ) + } + } + + alarmViewModel.resultModel.observe(this) { + if (it.code == 200) { + //上传经纬度以及甲烷浓度 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" } + + pointViewModel.uploadPointDetail( + taskId, + it.data.toString(), + lat, + lng, + speed.toString(), + deviceStatus, + "1", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + address, + dataModel?.horizontal.toString(), + System.currentTimeMillis().timestampToCompleteDate() + ) } } @@ -210,18 +266,10 @@ setMapConfig(savedInstanceState) /** - * 高德定位 + * 高德周期定位 * */ - LocationHelper.get.obtainLocationByGD(this, object : LocationHelper.ILocationListener { - override fun onLocationGet(location: Location?) { - - } - - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - if (aMapLocation == null) { - "当前信号弱，无法定位".show(context) - return - } + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { val longitude = aMapLocation.longitude.toString() val latitude = aMapLocation.latitude.toString() @@ -229,29 +277,6 @@ //发送位置信息给UDP服务端 udpClient.send("$longitude, $latitude") - //设置报警点的经纬度 - alarmParam.alarmLatitude = latitude - alarmParam.alarmLongitude = longitude - - //上传经纬度以及甲烷浓度 - val deviceStatus = if (dataModel?.methaneState == "正常") { - "1" - } else { - "0" - } - pointViewModel.uploadPointDetail( - isAlarm, - latitude, - dataModel?.methane.toString(), - dataModel?.vertical.toString(), - "", - aMapLocation.speed.toString(), - deviceStatus, - dataModel?.horizontal.toString(), - longitude, - System.currentTimeMillis().timestampToCompleteDate() - ) - //速度 转为 km/h speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() binding.carSpeedView.text = String.format("${speed}Km/h") @@ -270,20 +295,29 @@ ) if (isStartInspect) { - taskViewModel.updateTask( + //上传经纬度以及甲烷浓度，普通点 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" + } + pointViewModel.uploadPointDetail( taskId, - latLng.latitude, - latLng.longitude, + "", + lat, + lng, + speed.toString(), + deviceStatus, + "0", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + aMapLocation.address, + dataModel?.horizontal.toString(), System.currentTimeMillis().timestampToCompleteDate() ) } } - }) - - //初始化任务 - taskViewModel.addTask( - carId, latlngs.last.latitude.toString(), latlngs.last.longitude.toString(), taskTitle - ) + }, false) /** * TCP初始化 @@ -567,7 +601,7 @@ //配置设备通道 try { val deviceInfo = SDKGuider.sdkGuider.devManageGuider.devList[0] - returnUserID = deviceInfo.m_lUserID + returnUserId = deviceInfo.m_lUserID aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt() startAChannel = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt() @@ -609,7 +643,7 @@ strutPlayInfo.bBlocked = 1 strutPlayInfo.hHwnd = binding.videoSurfaceView.holder previewHandle = SDKGuider.sdkGuider.devPreviewGuider.RealPlay_V40_jni( - returnUserID, strutPlayInfo, null + returnUserId, strutPlayInfo, null ) if (previewHandle < 0) { Log.d(kTag, "NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}") @@ -621,7 +655,7 @@ //打开激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.OPEN_SENSOR_COMMAND, LocaleConstant.OPEN_SENSOR_COMMAND.size ) @@ -677,7 +711,7 @@ //串口编号 serialStart.wPort = 0 val serialHandle = hkSDK.NET_DVR_SerialStart_V40( - returnUserID, serialStart + returnUserId, serialStart ) { _, _, _, _ -> } //向透明通道发送数据，水平和垂直需要分开发送 @@ -722,7 +756,7 @@ strJpeg.wPicSize = 2 val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.png" - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserId, selectChannel, strJpeg, imagePath) if (MessageCodeHub.getErrorCode() == 0) { if (!isAutoCapture) { @@ -736,7 +770,7 @@ private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.CLOSE_SENSOR_COMMAND, LocaleConstant.CLOSE_SENSOR_COMMAND.size ) @@ -797,29 +831,13 @@ String.format("${dataModel!!.vertical}$degree") binding.gasConcentrationView.text = String.format("${dataModel!!.methane}ppm·m") - //TODO 报警视频 + if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //初始化alarmParam - alarmParam = AlarmParam( - "甲烷浓度超过阈值", - "", - "", - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - "", - deviceId, - "0", - "1", - "", - dataModel!!.methane.toString(), - taskId - ) - captureImage(true) - //抓取报警时候的视频并上传 + //TODO 抓取报警时候的视频并上传 } /***折线图**************************************************************************/ diff --git a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt index 1d2add1..55f387b 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt @@ -4,9 +4,9 @@ import com.casic.br.ktd.base.BaseApplication import com.casic.br.ktd.extensions.separateResponseCode import com.casic.br.ktd.extensions.toErrorMessage +import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.AlarmDetailModel import com.casic.br.ktd.model.AlarmListModel -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.AlarmRuleListModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -25,6 +25,7 @@ val alarmRuleList = MutableLiveData() val alarmList = MutableLiveData() val alarmDetail = MutableLiveData() + val resultModel = MutableLiveData() fun addAlarmRule(high: String, deviceId: String, ts: String) = launch({ loadState.value = LoadState.Loading @@ -53,8 +54,40 @@ it.printStackTrace() }) - fun addAlarm(alarmParam: AlarmParam) = launch({ - RetrofitServiceManager.addAlarm(alarmParam) + fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ) = launch({ + val response = RetrofitServiceManager.addAlarm( + taskId, + deviceId, + alarmContent, + alarmLongitude, + alarmLatitude, + alarmTime, + alarmThresh, + alarmPicture, + alarmStatus, + alarmType, + alarmVideo, + alarmValue + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } }, { it.printStackTrace() }) diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt index df6adb5..ec7ef43 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt @@ -1,14 +1,7 @@ package com.casic.br.ktd.utils -import android.Manifest import android.content.Context -import android.content.pm.PackageManager -import android.location.Location -import android.location.LocationListener -import android.location.LocationManager -import android.os.Bundle import android.util.Log -import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -34,36 +27,14 @@ locationOption.isLocationCacheEnable = true //可选，设置是否使用缓存定位，默认为true } - fun obtainLocation(context: Context, listener: ILocationListener) { - if (ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_FINE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED - ) { - return - } - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - //位置变化时更新位置 - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, - 3000, 5f, object : LocationListener { - override fun onLocationChanged(location: Location) { - listener.onLocationGet(location) - } - - override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {} - override fun onProviderEnabled(provider: String) {} - override fun onProviderDisabled(provider: String) {} - }) - } - /** * 高德sdk定位 */ - fun obtainLocationByGD(context: Context?, listener: ILocationListener) { + fun obtainLocation( + context: Context?, listener: ILocationListener, isOnceLocation: Boolean + ) { locationClient = AMapLocationClient(context) + locationOption.isOnceLocation = isOnceLocation //给定位客户端对象设置定位参数 locationClient.setLocationOption(locationOption) //设置定位回调监听 @@ -88,8 +59,6 @@ } interface ILocationListener { - fun onLocationGet(location: Location?) //GPS定位数据 - - fun onAMapLocationGet(aMapLocation: AMapLocation?) //高德定位数据 + fun onAMapLocationGet(aMapLocation: AMapLocation) //高德定位数据 } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index 342ac55..811e69d 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Color import android.graphics.PixelFormat -import android.location.Location import android.os.Bundle import android.os.Handler import android.os.Message @@ -27,7 +26,6 @@ import com.casic.br.ktd.R import com.casic.br.ktd.databinding.ActivityInspectionBinding import com.casic.br.ktd.extensions.* -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.ChartPointModel import com.casic.br.ktd.model.SensorDataModel import com.casic.br.ktd.netty.tcp.SocketManager @@ -84,7 +82,7 @@ private var previewHandle = -1 private var selectChannel = -1 private var selectStreamType = -1 - private var returnUserID = -1 + private var returnUserId = -1 private var aChannelNum = 0 private var startAChannel = 0 private var dChannelNum = 0 @@ -100,9 +98,6 @@ //巡检是否已开始 private var isStartInspect = false - //车速 - private var speed: Float = 0.0f - //云台转动速度 private var selectedSpeed = 0 @@ -122,7 +117,6 @@ private lateinit var pointViewModel: PointViewModel private lateinit var fileViewModel: FileViewModel private lateinit var alarmViewModel: AlarmViewModel - private lateinit var alarmParam: AlarmParam private var taskId = "" private var deviceId = "" private var dataModel: SensorDataModel? = null @@ -179,18 +173,80 @@ gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String + //初始化任务 + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + taskViewModel.addTask( + carId, + aMapLocation.latitude.toString(), + aMapLocation.longitude.toString(), + taskTitle + ) + } + }, true) taskViewModel.addTaskResult.observe(this) { if (it.code == 200) { taskId = it.data.toString() } } + + var lat = "" + var lng = "" + var address = "" + var speed = 0.0f fileViewModel.resultModel.observe(this) { if (it.code == 200) { - if (alarmParam.alarmLongitude.isNotEmpty() && alarmParam.alarmLatitude.isNotEmpty()) { - alarmParam.alarmPicture = it.data - alarmViewModel.addAlarm(alarmParam) + LocationHelper.get.obtainLocation( + this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + lat = aMapLocation.longitude.toString() + lng = aMapLocation.latitude.toString() + address = aMapLocation.address + speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + dataModel?.methane.toString(), + ) + } + }, true + ) + } + } + + alarmViewModel.resultModel.observe(this) { + if (it.code == 200) { + //上传经纬度以及甲烷浓度 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" } + + pointViewModel.uploadPointDetail( + taskId, + it.data.toString(), + lat, + lng, + speed.toString(), + deviceStatus, + "1", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + address, + dataModel?.horizontal.toString(), + System.currentTimeMillis().timestampToCompleteDate() + ) } } @@ -210,18 +266,10 @@ setMapConfig(savedInstanceState) /** - * 高德定位 + * 高德周期定位 * */ - LocationHelper.get.obtainLocationByGD(this, object : LocationHelper.ILocationListener { - override fun onLocationGet(location: Location?) { - - } - - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - if (aMapLocation == null) { - "当前信号弱，无法定位".show(context) - return - } + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { val longitude = aMapLocation.longitude.toString() val latitude = aMapLocation.latitude.toString() @@ -229,29 +277,6 @@ //发送位置信息给UDP服务端 udpClient.send("$longitude, $latitude") - //设置报警点的经纬度 - alarmParam.alarmLatitude = latitude - alarmParam.alarmLongitude = longitude - - //上传经纬度以及甲烷浓度 - val deviceStatus = if (dataModel?.methaneState == "正常") { - "1" - } else { - "0" - } - pointViewModel.uploadPointDetail( - isAlarm, - latitude, - dataModel?.methane.toString(), - dataModel?.vertical.toString(), - "", - aMapLocation.speed.toString(), - deviceStatus, - dataModel?.horizontal.toString(), - longitude, - System.currentTimeMillis().timestampToCompleteDate() - ) - //速度 转为 km/h speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() binding.carSpeedView.text = String.format("${speed}Km/h") @@ -270,20 +295,29 @@ ) if (isStartInspect) { - taskViewModel.updateTask( + //上传经纬度以及甲烷浓度，普通点 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" + } + pointViewModel.uploadPointDetail( taskId, - latLng.latitude, - latLng.longitude, + "", + lat, + lng, + speed.toString(), + deviceStatus, + "0", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + aMapLocation.address, + dataModel?.horizontal.toString(), System.currentTimeMillis().timestampToCompleteDate() ) } } - }) - - //初始化任务 - taskViewModel.addTask( - carId, latlngs.last.latitude.toString(), latlngs.last.longitude.toString(), taskTitle - ) + }, false) /** * TCP初始化 @@ -567,7 +601,7 @@ //配置设备通道 try { val deviceInfo = SDKGuider.sdkGuider.devManageGuider.devList[0] - returnUserID = deviceInfo.m_lUserID + returnUserId = deviceInfo.m_lUserID aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt() startAChannel = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt() @@ -609,7 +643,7 @@ strutPlayInfo.bBlocked = 1 strutPlayInfo.hHwnd = binding.videoSurfaceView.holder previewHandle = SDKGuider.sdkGuider.devPreviewGuider.RealPlay_V40_jni( - returnUserID, strutPlayInfo, null + returnUserId, strutPlayInfo, null ) if (previewHandle < 0) { Log.d(kTag, "NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}") @@ -621,7 +655,7 @@ //打开激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.OPEN_SENSOR_COMMAND, LocaleConstant.OPEN_SENSOR_COMMAND.size ) @@ -677,7 +711,7 @@ //串口编号 serialStart.wPort = 0 val serialHandle = hkSDK.NET_DVR_SerialStart_V40( - returnUserID, serialStart + returnUserId, serialStart ) { _, _, _, _ -> } //向透明通道发送数据，水平和垂直需要分开发送 @@ -722,7 +756,7 @@ strJpeg.wPicSize = 2 val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.png" - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserId, selectChannel, strJpeg, imagePath) if (MessageCodeHub.getErrorCode() == 0) { if (!isAutoCapture) { @@ -736,7 +770,7 @@ private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.CLOSE_SENSOR_COMMAND, LocaleConstant.CLOSE_SENSOR_COMMAND.size ) @@ -797,29 +831,13 @@ String.format("${dataModel!!.vertical}$degree") binding.gasConcentrationView.text = String.format("${dataModel!!.methane}ppm·m") - //TODO 报警视频 + if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //初始化alarmParam - alarmParam = AlarmParam( - "甲烷浓度超过阈值", - "", - "", - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - "", - deviceId, - "0", - "1", - "", - dataModel!!.methane.toString(), - taskId - ) - captureImage(true) - //抓取报警时候的视频并上传 + //TODO 抓取报警时候的视频并上传 } /***折线图**************************************************************************/ diff --git a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt index 1d2add1..55f387b 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt @@ -4,9 +4,9 @@ import com.casic.br.ktd.base.BaseApplication import com.casic.br.ktd.extensions.separateResponseCode import com.casic.br.ktd.extensions.toErrorMessage +import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.AlarmDetailModel import com.casic.br.ktd.model.AlarmListModel -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.AlarmRuleListModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -25,6 +25,7 @@ val alarmRuleList = MutableLiveData() val alarmList = MutableLiveData() val alarmDetail = MutableLiveData() + val resultModel = MutableLiveData() fun addAlarmRule(high: String, deviceId: String, ts: String) = launch({ loadState.value = LoadState.Loading @@ -53,8 +54,40 @@ it.printStackTrace() }) - fun addAlarm(alarmParam: AlarmParam) = launch({ - RetrofitServiceManager.addAlarm(alarmParam) + fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ) = launch({ + val response = RetrofitServiceManager.addAlarm( + taskId, + deviceId, + alarmContent, + alarmLongitude, + alarmLatitude, + alarmTime, + alarmThresh, + alarmPicture, + alarmStatus, + alarmType, + alarmVideo, + alarmValue + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } }, { it.printStackTrace() }) diff --git a/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt index c869ed8..8a334cf 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt @@ -1,15 +1,7 @@ package com.casic.br.ktd.vm -import androidx.lifecycle.MutableLiveData -import com.casic.br.ktd.base.BaseApplication -import com.casic.br.ktd.extensions.separateResponseCode -import com.casic.br.ktd.extensions.toErrorMessage -import com.casic.br.ktd.model.VehicleRouteModel import com.casic.br.ktd.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel /** @@ -17,48 +9,35 @@ * */ class PointViewModel : BaseViewModel() { - private val gson by lazy { Gson() } - val vehicleRoute = MutableLiveData() - fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ) = launch({ RetrofitServiceManager.uploadPointDetail( - isAlarm, + taskId, + alarmCode, lagitude, + longitude, + speed, + deviceStatus, + isAlarm, gas, pitch, position, - speed, - deviceStatus, direction, - longitude, ts ) }, { it.printStackTrace() }) - - fun busTrackRoute() = launch({ - val response = RetrofitServiceManager.busTrackRoute() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - vehicleRoute.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.printStackTrace() - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt b/app/src/main/java/com/casic/br/ktd/model/PointModel.kt deleted file mode 100644 index ec2065d..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/PointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class PointModel(var lat: Double, var lng: Double) diff --git a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java b/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java deleted file mode 100644 index e813075..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/VehicleRouteModel.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.casic.br.ktd.model; - -import java.util.List; - -public class VehicleRouteModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private Integer total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public static class RowsModel { - private String deviceStatus; - private String direction; - private String gas; - private String id; - private String isAlarm; - private String lagitude; - private String longitude; - private String pitch; - private String position; - private String speed; - private String taskId; - private String ts; - - public String getDeviceStatus() { - return deviceStatus; - } - - public void setDeviceStatus(String deviceStatus) { - this.deviceStatus = deviceStatus; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsAlarm() { - return isAlarm; - } - - public void setIsAlarm(String isAlarm) { - this.isAlarm = isAlarm; - } - - public String getLagitude() { - return lagitude; - } - - public void setLagitude(String lagitude) { - this.lagitude = lagitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getPitch() { - return pitch; - } - - public void setPitch(String pitch) { - this.pitch = pitch; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getSpeed() { - return speed; - } - - public void setSpeed(String speed) { - this.speed = speed; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 82bbba7..bc6203c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -62,15 +62,6 @@ ): String /** - * 更新任务经纬度 - */ - @POST("/system/busPatrolTask/edit") - suspend fun updateTask( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** * 结束任务 */ @POST("/system/busPatrolTask/getDistance") @@ -138,16 +129,6 @@ ): String /** - * 巡检路径 - */ - @POST("/system/busPatrolTrack/listPage") - suspend fun busTrackRoute( - @Header("token") token: String, - @QueryMap limit: Map, - @QueryMap offset: Map - ): String - - /** * 新增报警规则，主要是阈值 */ @POST("/system/alarmRule/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 6753b5c..08f1716 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.br.ktd.retrofit -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.FileType import com.casic.br.ktd.utils.LocaleConstant @@ -119,23 +118,6 @@ } /** - * 更新任务 - */ - suspend fun updateTask( - id: String, latitude: Double, longitude: Double, updateTime: String - ): String { - val param = JsonObject() - param.addProperty("id", id) - param.addProperty("latitude", latitude) - param.addProperty("longitude", longitude) - param.addProperty("updateTime", updateTime) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.updateTask(AuthenticationHelper.token, requestBody) - } - - /** * 任务详情 */ suspend fun getTaskRoute( @@ -237,28 +219,33 @@ * 新增巡检过程点详情 */ suspend fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ): String { val param = JsonObject() - param.addProperty("isAlarm", isAlarm) param.addProperty("lagitude", lagitude) + param.addProperty("alarmCode", alarmCode) + param.addProperty("speed", speed) + param.addProperty("deviceStatus", deviceStatus) + param.addProperty("isAlarm", isAlarm) param.addProperty("gas", gas) param.addProperty("pitch", pitch) param.addProperty("position", position) - param.addProperty("speed", speed) - param.addProperty("deviceStatus", deviceStatus) + param.addProperty("taskId", taskId) param.addProperty("direction", direction) param.addProperty("longitude", longitude) param.addProperty("ts", ts) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) @@ -266,18 +253,6 @@ } /** - * 巡检路径 - */ - suspend fun busTrackRoute(): String { - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = 1 - return api.busTrackRoute(AuthenticationHelper.token, limitMap, offsetMap) - } - - /** * 新增报警规则，主要是阈值 */ suspend fun addAlarmRule(high: String, deviceId: String, ts: String): String { @@ -318,20 +293,34 @@ /** * 新增报警记录 */ - suspend fun addAlarm(alarmParam: AlarmParam): String { + suspend fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ): String { val param = JsonObject() - param.addProperty("alarmContent", alarmParam.alarmContent) - param.addProperty("alarmLongitude", alarmParam.alarmLongitude) - param.addProperty("alarmLatitude", alarmParam.alarmLatitude) - param.addProperty("alarmTime", alarmParam.alarmTime) - param.addProperty("alarmThresh", alarmParam.alarmThresh) - param.addProperty("alarmPicture", alarmParam.alarmPicture) - param.addProperty("deviceId", alarmParam.deviceId) - param.addProperty("alarmStatus", alarmParam.alarmStatus) - param.addProperty("alarmType", alarmParam.alarmType) - param.addProperty("alarmVideo", alarmParam.alarmVideo) - param.addProperty("alarmValue", alarmParam.alarmValue) - param.addProperty("taskId", alarmParam.taskId) + param.addProperty("taskId", taskId) + param.addProperty("deviceId", deviceId) + param.addProperty("alarmContent", alarmContent) + param.addProperty("alarmLongitude", alarmLongitude) + param.addProperty("alarmLatitude", alarmLatitude) + param.addProperty("alarmTime", alarmTime) + param.addProperty("alarmThresh", alarmThresh) + param.addProperty("alarmPicture", alarmPicture) + param.addProperty("alarmStatus", alarmStatus) + param.addProperty("alarmType", alarmType) + param.addProperty("alarmVideo", alarmVideo) + param.addProperty("alarmValue", alarmValue) + val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt index df6adb5..ec7ef43 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocationHelper.kt @@ -1,14 +1,7 @@ package com.casic.br.ktd.utils -import android.Manifest import android.content.Context -import android.content.pm.PackageManager -import android.location.Location -import android.location.LocationListener -import android.location.LocationManager -import android.os.Bundle import android.util.Log -import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -34,36 +27,14 @@ locationOption.isLocationCacheEnable = true //可选，设置是否使用缓存定位，默认为true } - fun obtainLocation(context: Context, listener: ILocationListener) { - if (ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_FINE_LOCATION - ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission( - context, Manifest.permission.ACCESS_COARSE_LOCATION - ) != PackageManager.PERMISSION_GRANTED - ) { - return - } - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - //位置变化时更新位置 - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, - 3000, 5f, object : LocationListener { - override fun onLocationChanged(location: Location) { - listener.onLocationGet(location) - } - - override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {} - override fun onProviderEnabled(provider: String) {} - override fun onProviderDisabled(provider: String) {} - }) - } - /** * 高德sdk定位 */ - fun obtainLocationByGD(context: Context?, listener: ILocationListener) { + fun obtainLocation( + context: Context?, listener: ILocationListener, isOnceLocation: Boolean + ) { locationClient = AMapLocationClient(context) + locationOption.isOnceLocation = isOnceLocation //给定位客户端对象设置定位参数 locationClient.setLocationOption(locationOption) //设置定位回调监听 @@ -88,8 +59,6 @@ } interface ILocationListener { - fun onLocationGet(location: Location?) //GPS定位数据 - - fun onAMapLocationGet(aMapLocation: AMapLocation?) //高德定位数据 + fun onAMapLocationGet(aMapLocation: AMapLocation) //高德定位数据 } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index 342ac55..811e69d 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Color import android.graphics.PixelFormat -import android.location.Location import android.os.Bundle import android.os.Handler import android.os.Message @@ -27,7 +26,6 @@ import com.casic.br.ktd.R import com.casic.br.ktd.databinding.ActivityInspectionBinding import com.casic.br.ktd.extensions.* -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.ChartPointModel import com.casic.br.ktd.model.SensorDataModel import com.casic.br.ktd.netty.tcp.SocketManager @@ -84,7 +82,7 @@ private var previewHandle = -1 private var selectChannel = -1 private var selectStreamType = -1 - private var returnUserID = -1 + private var returnUserId = -1 private var aChannelNum = 0 private var startAChannel = 0 private var dChannelNum = 0 @@ -100,9 +98,6 @@ //巡检是否已开始 private var isStartInspect = false - //车速 - private var speed: Float = 0.0f - //云台转动速度 private var selectedSpeed = 0 @@ -122,7 +117,6 @@ private lateinit var pointViewModel: PointViewModel private lateinit var fileViewModel: FileViewModel private lateinit var alarmViewModel: AlarmViewModel - private lateinit var alarmParam: AlarmParam private var taskId = "" private var deviceId = "" private var dataModel: SensorDataModel? = null @@ -179,18 +173,80 @@ gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String + //初始化任务 + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + taskViewModel.addTask( + carId, + aMapLocation.latitude.toString(), + aMapLocation.longitude.toString(), + taskTitle + ) + } + }, true) taskViewModel.addTaskResult.observe(this) { if (it.code == 200) { taskId = it.data.toString() } } + + var lat = "" + var lng = "" + var address = "" + var speed = 0.0f fileViewModel.resultModel.observe(this) { if (it.code == 200) { - if (alarmParam.alarmLongitude.isNotEmpty() && alarmParam.alarmLatitude.isNotEmpty()) { - alarmParam.alarmPicture = it.data - alarmViewModel.addAlarm(alarmParam) + LocationHelper.get.obtainLocation( + this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { + lat = aMapLocation.longitude.toString() + lng = aMapLocation.latitude.toString() + address = aMapLocation.address + speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + dataModel?.methane.toString(), + ) + } + }, true + ) + } + } + + alarmViewModel.resultModel.observe(this) { + if (it.code == 200) { + //上传经纬度以及甲烷浓度 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" } + + pointViewModel.uploadPointDetail( + taskId, + it.data.toString(), + lat, + lng, + speed.toString(), + deviceStatus, + "1", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + address, + dataModel?.horizontal.toString(), + System.currentTimeMillis().timestampToCompleteDate() + ) } } @@ -210,18 +266,10 @@ setMapConfig(savedInstanceState) /** - * 高德定位 + * 高德周期定位 * */ - LocationHelper.get.obtainLocationByGD(this, object : LocationHelper.ILocationListener { - override fun onLocationGet(location: Location?) { - - } - - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - if (aMapLocation == null) { - "当前信号弱，无法定位".show(context) - return - } + LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation) { val longitude = aMapLocation.longitude.toString() val latitude = aMapLocation.latitude.toString() @@ -229,29 +277,6 @@ //发送位置信息给UDP服务端 udpClient.send("$longitude, $latitude") - //设置报警点的经纬度 - alarmParam.alarmLatitude = latitude - alarmParam.alarmLongitude = longitude - - //上传经纬度以及甲烷浓度 - val deviceStatus = if (dataModel?.methaneState == "正常") { - "1" - } else { - "0" - } - pointViewModel.uploadPointDetail( - isAlarm, - latitude, - dataModel?.methane.toString(), - dataModel?.vertical.toString(), - "", - aMapLocation.speed.toString(), - deviceStatus, - dataModel?.horizontal.toString(), - longitude, - System.currentTimeMillis().timestampToCompleteDate() - ) - //速度 转为 km/h speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() binding.carSpeedView.text = String.format("${speed}Km/h") @@ -270,20 +295,29 @@ ) if (isStartInspect) { - taskViewModel.updateTask( + //上传经纬度以及甲烷浓度，普通点 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" + } + pointViewModel.uploadPointDetail( taskId, - latLng.latitude, - latLng.longitude, + "", + lat, + lng, + speed.toString(), + deviceStatus, + "0", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + aMapLocation.address, + dataModel?.horizontal.toString(), System.currentTimeMillis().timestampToCompleteDate() ) } } - }) - - //初始化任务 - taskViewModel.addTask( - carId, latlngs.last.latitude.toString(), latlngs.last.longitude.toString(), taskTitle - ) + }, false) /** * TCP初始化 @@ -567,7 +601,7 @@ //配置设备通道 try { val deviceInfo = SDKGuider.sdkGuider.devManageGuider.devList[0] - returnUserID = deviceInfo.m_lUserID + returnUserId = deviceInfo.m_lUserID aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt() startAChannel = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt() @@ -609,7 +643,7 @@ strutPlayInfo.bBlocked = 1 strutPlayInfo.hHwnd = binding.videoSurfaceView.holder previewHandle = SDKGuider.sdkGuider.devPreviewGuider.RealPlay_V40_jni( - returnUserID, strutPlayInfo, null + returnUserId, strutPlayInfo, null ) if (previewHandle < 0) { Log.d(kTag, "NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}") @@ -621,7 +655,7 @@ //打开激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.OPEN_SENSOR_COMMAND, LocaleConstant.OPEN_SENSOR_COMMAND.size ) @@ -677,7 +711,7 @@ //串口编号 serialStart.wPort = 0 val serialHandle = hkSDK.NET_DVR_SerialStart_V40( - returnUserID, serialStart + returnUserId, serialStart ) { _, _, _, _ -> } //向透明通道发送数据，水平和垂直需要分开发送 @@ -722,7 +756,7 @@ strJpeg.wPicSize = 2 val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.png" - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserId, selectChannel, strJpeg, imagePath) if (MessageCodeHub.getErrorCode() == 0) { if (!isAutoCapture) { @@ -736,7 +770,7 @@ private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( - returnUserID, 2, 1, + returnUserId, 2, 1, LocaleConstant.CLOSE_SENSOR_COMMAND, LocaleConstant.CLOSE_SENSOR_COMMAND.size ) @@ -797,29 +831,13 @@ String.format("${dataModel!!.vertical}$degree") binding.gasConcentrationView.text = String.format("${dataModel!!.methane}ppm·m") - //TODO 报警视频 + if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //初始化alarmParam - alarmParam = AlarmParam( - "甲烷浓度超过阈值", - "", - "", - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - "", - deviceId, - "0", - "1", - "", - dataModel!!.methane.toString(), - taskId - ) - captureImage(true) - //抓取报警时候的视频并上传 + //TODO 抓取报警时候的视频并上传 } /***折线图**************************************************************************/ diff --git a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt index 1d2add1..55f387b 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AlarmViewModel.kt @@ -4,9 +4,9 @@ import com.casic.br.ktd.base.BaseApplication import com.casic.br.ktd.extensions.separateResponseCode import com.casic.br.ktd.extensions.toErrorMessage +import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.AlarmDetailModel import com.casic.br.ktd.model.AlarmListModel -import com.casic.br.ktd.model.AlarmParam import com.casic.br.ktd.model.AlarmRuleListModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -25,6 +25,7 @@ val alarmRuleList = MutableLiveData() val alarmList = MutableLiveData() val alarmDetail = MutableLiveData() + val resultModel = MutableLiveData() fun addAlarmRule(high: String, deviceId: String, ts: String) = launch({ loadState.value = LoadState.Loading @@ -53,8 +54,40 @@ it.printStackTrace() }) - fun addAlarm(alarmParam: AlarmParam) = launch({ - RetrofitServiceManager.addAlarm(alarmParam) + fun addAlarm( + taskId: String, + deviceId: String, + alarmContent: String, + alarmLongitude: String, + alarmLatitude: String, + alarmTime: String, + alarmThresh: String, + alarmPicture: String, + alarmStatus: String, + alarmType: String, + alarmVideo: String, + alarmValue: String + ) = launch({ + val response = RetrofitServiceManager.addAlarm( + taskId, + deviceId, + alarmContent, + alarmLongitude, + alarmLatitude, + alarmTime, + alarmThresh, + alarmPicture, + alarmStatus, + alarmType, + alarmVideo, + alarmValue + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } }, { it.printStackTrace() }) diff --git a/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt index c869ed8..8a334cf 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/PointViewModel.kt @@ -1,15 +1,7 @@ package com.casic.br.ktd.vm -import androidx.lifecycle.MutableLiveData -import com.casic.br.ktd.base.BaseApplication -import com.casic.br.ktd.extensions.separateResponseCode -import com.casic.br.ktd.extensions.toErrorMessage -import com.casic.br.ktd.model.VehicleRouteModel import com.casic.br.ktd.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel /** @@ -17,48 +9,35 @@ * */ class PointViewModel : BaseViewModel() { - private val gson by lazy { Gson() } - val vehicleRoute = MutableLiveData() - fun uploadPointDetail( - isAlarm: String, + taskId: String, + alarmCode: String, lagitude: String, + longitude: String, + speed: String, + deviceStatus: String, + isAlarm: String, gas: String, pitch: String, position: String, - speed: String, - deviceStatus: String, direction: String, - longitude: String, ts: String ) = launch({ RetrofitServiceManager.uploadPointDetail( - isAlarm, + taskId, + alarmCode, lagitude, + longitude, + speed, + deviceStatus, + isAlarm, gas, pitch, position, - speed, - deviceStatus, direction, - longitude, ts ) }, { it.printStackTrace() }) - - fun busTrackRoute() = launch({ - val response = RetrofitServiceManager.busTrackRoute() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - vehicleRoute.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.printStackTrace() - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt index 84568f5..d228b9c 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt @@ -62,10 +62,6 @@ it.printStackTrace() }) - fun updateTask(id: String, latitude: Double, longitude: Double, updateTime: String) = launch({ - RetrofitServiceManager.updateTask(id, latitude, longitude, updateTime) - }) - fun getTaskRoute( taskId: String, beginDate: String,