diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java deleted file mode 100644 index 321b2bd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.br.operationsite.model; - -public class OtherAlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String break_alarm; - private String helmet_alarm; - private String smoke_alarm; - private double smoke_conf; - - public String getBreak_alarm() { - return break_alarm; - } - - public void setBreak_alarm(String break_alarm) { - this.break_alarm = break_alarm; - } - - public String getHelmet_alarm() { - return helmet_alarm; - } - - public void setHelmet_alarm(String helmet_alarm) { - this.helmet_alarm = helmet_alarm; - } - - public String getSmoke_alarm() { - return smoke_alarm; - } - - public void setSmoke_alarm(String smoke_alarm) { - this.smoke_alarm = smoke_alarm; - } - - public double getSmoke_conf() { - return smoke_conf; - } - - public void setSmoke_conf(double smoke_conf) { - this.smoke_conf = smoke_conf; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java deleted file mode 100644 index 321b2bd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.br.operationsite.model; - -public class OtherAlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String break_alarm; - private String helmet_alarm; - private String smoke_alarm; - private double smoke_conf; - - public String getBreak_alarm() { - return break_alarm; - } - - public void setBreak_alarm(String break_alarm) { - this.break_alarm = break_alarm; - } - - public String getHelmet_alarm() { - return helmet_alarm; - } - - public void setHelmet_alarm(String helmet_alarm) { - this.helmet_alarm = helmet_alarm; - } - - public String getSmoke_alarm() { - return smoke_alarm; - } - - public void setSmoke_alarm(String smoke_alarm) { - this.smoke_alarm = smoke_alarm; - } - - public double getSmoke_conf() { - return smoke_conf; - } - - public void setSmoke_conf(double smoke_conf) { - this.smoke_conf = smoke_conf; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 901c010..c093f36 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -121,30 +121,6 @@ ): String /** - * 声光报警开关 - */ - @POST("/setAlarmState") - suspend fun changeAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询声光报警状态 - */ - @GET("/getAlarmState") - suspend fun getAlarmState(@Query("deviceIp") deviceIp: String): String - - /** - * 其他报警开关 - * */ - @POST("/setModelConfig") - suspend fun changeOtherAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询其他报警状态 - */ - @GET("/getModelConfig") - suspend fun getOtherAlarmState(@Query("deviceIp") deviceIp: String): String - - /** * 上传图片 * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java deleted file mode 100644 index 321b2bd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.br.operationsite.model; - -public class OtherAlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String break_alarm; - private String helmet_alarm; - private String smoke_alarm; - private double smoke_conf; - - public String getBreak_alarm() { - return break_alarm; - } - - public void setBreak_alarm(String break_alarm) { - this.break_alarm = break_alarm; - } - - public String getHelmet_alarm() { - return helmet_alarm; - } - - public void setHelmet_alarm(String helmet_alarm) { - this.helmet_alarm = helmet_alarm; - } - - public String getSmoke_alarm() { - return smoke_alarm; - } - - public void setSmoke_alarm(String smoke_alarm) { - this.smoke_alarm = smoke_alarm; - } - - public double getSmoke_conf() { - return smoke_conf; - } - - public void setSmoke_conf(double smoke_conf) { - this.smoke_conf = smoke_conf; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 901c010..c093f36 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -121,30 +121,6 @@ ): String /** - * 声光报警开关 - */ - @POST("/setAlarmState") - suspend fun changeAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询声光报警状态 - */ - @GET("/getAlarmState") - suspend fun getAlarmState(@Query("deviceIp") deviceIp: String): String - - /** - * 其他报警开关 - * */ - @POST("/setModelConfig") - suspend fun changeOtherAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询其他报警状态 - */ - @GET("/getModelConfig") - suspend fun getOtherAlarmState(@Query("deviceIp") deviceIp: String): String - - /** * 上传图片 * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 98f2892..60770c7 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -212,58 +212,6 @@ } /** - * 设置声光报警开关 - */ - suspend fun changeAlarmState(httpConfig: String, deviceIp: String, state: String): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("state", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeAlarmState(requestBody) - } - - /** - * 查询声光报警状态 - */ - suspend fun getAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getAlarmState(deviceIp) - } - - /** - * 其他报警开关 - * */ - suspend fun changeOtherAlarmState( - httpConfig: String, deviceIp: String, model: String, conf: String, state: String - ): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("model", model) - if (conf != "") { - param.addProperty("conf", conf) - } - param.addProperty("alarm", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeOtherAlarmState(requestBody) - } - - /** - * 查询其他报警状态 - */ - suspend fun getOtherAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getOtherAlarmState(deviceIp) - } - - /** * 执行设备控制指令 */ suspend fun executeDeviceCommand(action: String, speed: Int): String { diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java deleted file mode 100644 index 321b2bd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.br.operationsite.model; - -public class OtherAlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String break_alarm; - private String helmet_alarm; - private String smoke_alarm; - private double smoke_conf; - - public String getBreak_alarm() { - return break_alarm; - } - - public void setBreak_alarm(String break_alarm) { - this.break_alarm = break_alarm; - } - - public String getHelmet_alarm() { - return helmet_alarm; - } - - public void setHelmet_alarm(String helmet_alarm) { - this.helmet_alarm = helmet_alarm; - } - - public String getSmoke_alarm() { - return smoke_alarm; - } - - public void setSmoke_alarm(String smoke_alarm) { - this.smoke_alarm = smoke_alarm; - } - - public double getSmoke_conf() { - return smoke_conf; - } - - public void setSmoke_conf(double smoke_conf) { - this.smoke_conf = smoke_conf; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 901c010..c093f36 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -121,30 +121,6 @@ ): String /** - * 声光报警开关 - */ - @POST("/setAlarmState") - suspend fun changeAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询声光报警状态 - */ - @GET("/getAlarmState") - suspend fun getAlarmState(@Query("deviceIp") deviceIp: String): String - - /** - * 其他报警开关 - * */ - @POST("/setModelConfig") - suspend fun changeOtherAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询其他报警状态 - */ - @GET("/getModelConfig") - suspend fun getOtherAlarmState(@Query("deviceIp") deviceIp: String): String - - /** * 上传图片 * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 98f2892..60770c7 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -212,58 +212,6 @@ } /** - * 设置声光报警开关 - */ - suspend fun changeAlarmState(httpConfig: String, deviceIp: String, state: String): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("state", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeAlarmState(requestBody) - } - - /** - * 查询声光报警状态 - */ - suspend fun getAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getAlarmState(deviceIp) - } - - /** - * 其他报警开关 - * */ - suspend fun changeOtherAlarmState( - httpConfig: String, deviceIp: String, model: String, conf: String, state: String - ): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("model", model) - if (conf != "") { - param.addProperty("conf", conf) - } - param.addProperty("alarm", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeOtherAlarmState(requestBody) - } - - /** - * 查询其他报警状态 - */ - suspend fun getOtherAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getOtherAlarmState(deviceIp) - } - - /** * 执行设备控制指令 */ suspend fun executeDeviceCommand(action: String, speed: Int): String { diff --git a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt index e8b5de3..9fd5e00 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt @@ -19,18 +19,17 @@ private val kTag = "ForegroundRunningService" private val notificationId = 1 - private var notificationManager: NotificationManager? = null + private val notificationManager by lazy { getSystemService(NOTIFICATION_SERVICE) as NotificationManager } private var notificationBuilder: NotificationCompat.Builder? = null override fun onCreate() { super.onCreate() - notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager val name = "${resources.getString(R.string.app_name)}前台服务" val channel = NotificationChannel( "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH ) channel.description = "Channel for Foreground Running Service" - notificationManager?.createNotificationChannel(channel) + notificationManager.createNotificationChannel(channel) notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel") .setSmallIcon(R.mipmap.ic_launcher) .setContentTitle("通讯服务连接中...") @@ -57,7 +56,7 @@ 2024110503 -> notificationBuilder?.setContentTitle("通讯服务连接出错，开始重连") } val notification = notificationBuilder?.build() - notificationManager?.notify(notificationId, notification) + notificationManager.notify(notificationId, notification) return true } diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java deleted file mode 100644 index 387de3a..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/AlarmStateModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.operationsite.model; - -public class AlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String deviceIp; - private String state; - - public String getDeviceIp() { - return deviceIp; - } - - public void setDeviceIp(String deviceIp) { - this.deviceIp = deviceIp; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java deleted file mode 100644 index 321b2bd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.br.operationsite.model; - -public class OtherAlarmStateModel { - - private int code; - private DataModel data; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private String break_alarm; - private String helmet_alarm; - private String smoke_alarm; - private double smoke_conf; - - public String getBreak_alarm() { - return break_alarm; - } - - public void setBreak_alarm(String break_alarm) { - this.break_alarm = break_alarm; - } - - public String getHelmet_alarm() { - return helmet_alarm; - } - - public void setHelmet_alarm(String helmet_alarm) { - this.helmet_alarm = helmet_alarm; - } - - public String getSmoke_alarm() { - return smoke_alarm; - } - - public void setSmoke_alarm(String smoke_alarm) { - this.smoke_alarm = smoke_alarm; - } - - public double getSmoke_conf() { - return smoke_conf; - } - - public void setSmoke_conf(double smoke_conf) { - this.smoke_conf = smoke_conf; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 901c010..c093f36 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -121,30 +121,6 @@ ): String /** - * 声光报警开关 - */ - @POST("/setAlarmState") - suspend fun changeAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询声光报警状态 - */ - @GET("/getAlarmState") - suspend fun getAlarmState(@Query("deviceIp") deviceIp: String): String - - /** - * 其他报警开关 - * */ - @POST("/setModelConfig") - suspend fun changeOtherAlarmState(@Body requestBody: RequestBody): String - - /** - * 查询其他报警状态 - */ - @GET("/getModelConfig") - suspend fun getOtherAlarmState(@Query("deviceIp") deviceIp: String): String - - /** * 上传图片 * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 98f2892..60770c7 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -212,58 +212,6 @@ } /** - * 设置声光报警开关 - */ - suspend fun changeAlarmState(httpConfig: String, deviceIp: String, state: String): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("state", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeAlarmState(requestBody) - } - - /** - * 查询声光报警状态 - */ - suspend fun getAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getAlarmState(deviceIp) - } - - /** - * 其他报警开关 - * */ - suspend fun changeOtherAlarmState( - httpConfig: String, deviceIp: String, model: String, conf: String, state: String - ): String { - val param = JsonObject() - param.addProperty("deviceIp", deviceIp) - param.addProperty("model", model) - if (conf != "") { - param.addProperty("conf", conf) - } - param.addProperty("alarm", state) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.changeOtherAlarmState(requestBody) - } - - /** - * 查询其他报警状态 - */ - suspend fun getOtherAlarmState(httpConfig: String, deviceIp: String): String { - val service = RetrofitFactory.createRetrofit("http://$httpConfig:5000") - return service.getOtherAlarmState(deviceIp) - } - - /** * 执行设备控制指令 */ suspend fun executeDeviceCommand(action: String, speed: Int): String { diff --git a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt index e8b5de3..9fd5e00 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt @@ -19,18 +19,17 @@ private val kTag = "ForegroundRunningService" private val notificationId = 1 - private var notificationManager: NotificationManager? = null + private val notificationManager by lazy { getSystemService(NOTIFICATION_SERVICE) as NotificationManager } private var notificationBuilder: NotificationCompat.Builder? = null override fun onCreate() { super.onCreate() - notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager val name = "${resources.getString(R.string.app_name)}前台服务" val channel = NotificationChannel( "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH ) channel.description = "Channel for Foreground Running Service" - notificationManager?.createNotificationChannel(channel) + notificationManager.createNotificationChannel(channel) notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel") .setSmallIcon(R.mipmap.ic_launcher) .setContentTitle("通讯服务连接中...") @@ -57,7 +56,7 @@ 2024110503 -> notificationBuilder?.setContentTitle("通讯服务连接出错，开始重连") } val notification = notificationBuilder?.build() - notificationManager?.notify(notificationId, notification) + notificationManager.notify(notificationId, notification) return true } diff --git a/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt index 578d8e3..d1bd1b8 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt @@ -5,8 +5,6 @@ import com.casic.br.operationsite.extensions.getResponseCode import com.casic.br.operationsite.extensions.getResponseMessage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.model.AlarmStateModel -import com.casic.br.operationsite.model.OtherAlarmStateModel import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,8 +17,6 @@ private val gson = Gson() val alarmModel = MutableLiveData() - val stateResult = MutableLiveData() - val otherStateResult = MutableLiveData() fun getAlarmListByPage(context: Context, alarmType: String, page: Int) = launch({ loadState.value = LoadState.Loading @@ -42,54 +38,4 @@ loadState.value = LoadState.Fail it.printStackTrace() }) - - fun changeAlarmState(httpConfig: String, deviceIp: String, state: String) = launch({ - RetrofitServiceManager.changeAlarmState(httpConfig, deviceIp, state) - }) - - fun getAlarmState(context: Context, httpConfig: String, deviceIp: String) = launch({ - val response = RetrofitServiceManager.getAlarmState(httpConfig, deviceIp) - when (response.getResponseCode()) { - 200 -> { - stateResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } - - else -> { - response.getResponseMessage().show(context) - } - } - }, { - it.printStackTrace() - }) - - /** - * 其他报警开关 - * */ - fun changeOtherAlarmState( - httpConfig: String, deviceIp: String, model: String, conf: String, state: String - ) = launch({ - RetrofitServiceManager.changeOtherAlarmState(httpConfig, deviceIp, model, conf, state) - }) - - /** - * 查询其他报警状态 - */ - fun getOtherAlarmState(context: Context, httpConfig: String, deviceIp: String) = launch({ - val response = RetrofitServiceManager.getOtherAlarmState(httpConfig, deviceIp) - when (response.getResponseCode()) { - 200 -> { - otherStateResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } - - else -> { - response.getResponseMessage().show(context) - } - } - }, { - it.printStackTrace() - }) } \ No newline at end of file