diff --git a/app/build.gradle b/app/build.gradle index a3e0a57..d52b085 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6.0" + versionCode 1070 + versionName "1.0.7.0" } buildTypes { diff --git a/app/build.gradle b/app/build.gradle index a3e0a57..d52b085 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6.0" + versionCode 1070 + versionName "1.0.7.0" } buildTypes { 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 index a61a70b..321b2bd 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java @@ -32,7 +32,7 @@ public static class DataModel { private String break_alarm; - private String no_supervisor_alarm; + private String helmet_alarm; private String smoke_alarm; private double smoke_conf; @@ -44,12 +44,12 @@ this.break_alarm = break_alarm; } - public String getNo_supervisor_alarm() { - return no_supervisor_alarm; + public String getHelmet_alarm() { + return helmet_alarm; } - public void setNo_supervisor_alarm(String no_supervisor_alarm) { - this.no_supervisor_alarm = no_supervisor_alarm; + public void setHelmet_alarm(String helmet_alarm) { + this.helmet_alarm = helmet_alarm; } public String getSmoke_alarm() { diff --git a/app/build.gradle b/app/build.gradle index a3e0a57..d52b085 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6.0" + versionCode 1070 + versionName "1.0.7.0" } buildTypes { 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 index a61a70b..321b2bd 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/OtherAlarmStateModel.java @@ -32,7 +32,7 @@ public static class DataModel { private String break_alarm; - private String no_supervisor_alarm; + private String helmet_alarm; private String smoke_alarm; private double smoke_conf; @@ -44,12 +44,12 @@ this.break_alarm = break_alarm; } - public String getNo_supervisor_alarm() { - return no_supervisor_alarm; + public String getHelmet_alarm() { + return helmet_alarm; } - public void setNo_supervisor_alarm(String no_supervisor_alarm) { - this.no_supervisor_alarm = no_supervisor_alarm; + public void setHelmet_alarm(String helmet_alarm) { + this.helmet_alarm = helmet_alarm; } public String getSmoke_alarm() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index cb6f94b..4af1b8e 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -270,7 +270,7 @@ alarmViewModel.otherStateResult.observe(this) { result -> if (result.code == 200) { result.data.let { - binding.helmetCheckBox.isChecked = it.break_alarm == "1" + binding.helmetCheckBox.isChecked = it.helmet_alarm == "1" binding.smokeCheckbox.isChecked = it.smoke_alarm == "1" } }