diff --git a/app/build.gradle b/app/build.gradle index fbd479f..361554e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ applicationId "com.casic.br.operationsite.test" minSdkVersion 23 targetSdkVersion 33 - versionCode 1070 - versionName "1.0.7.0" + versionCode 1080 + versionName "1.0.8.0" } buildTypes { diff --git a/app/build.gradle b/app/build.gradle index fbd479f..361554e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ applicationId "com.casic.br.operationsite.test" minSdkVersion 23 targetSdkVersion 33 - versionCode 1070 - versionName "1.0.7.0" + versionCode 1080 + versionName "1.0.8.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java index 5e458f1..46c17e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java @@ -31,11 +31,29 @@ } public static class DataModel { + private String extinguisher_alarm; + private String blower_alarm; private String break_alarm; private String no_supervisor_alarm; private String smoke_alarm; private double smoke_conf; + public String getExtinguisher_alarm() { + return extinguisher_alarm; + } + + public void setExtinguisher_alarm(String extinguisher_alarm) { + this.extinguisher_alarm = extinguisher_alarm; + } + + public String getBlower_alarm() { + return blower_alarm; + } + + public void setBlower_alarm(String blower_alarm) { + this.blower_alarm = blower_alarm; + } + public String getBreak_alarm() { return break_alarm; } diff --git a/app/build.gradle b/app/build.gradle index fbd479f..361554e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ applicationId "com.casic.br.operationsite.test" minSdkVersion 23 targetSdkVersion 33 - versionCode 1070 - versionName "1.0.7.0" + versionCode 1080 + versionName "1.0.8.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java index 5e458f1..46c17e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java @@ -31,11 +31,29 @@ } public static class DataModel { + private String extinguisher_alarm; + private String blower_alarm; private String break_alarm; private String no_supervisor_alarm; private String smoke_alarm; private double smoke_conf; + public String getExtinguisher_alarm() { + return extinguisher_alarm; + } + + public void setExtinguisher_alarm(String extinguisher_alarm) { + this.extinguisher_alarm = extinguisher_alarm; + } + + public String getBlower_alarm() { + return blower_alarm; + } + + public void setBlower_alarm(String blower_alarm) { + this.blower_alarm = blower_alarm; + } + public String getBreak_alarm() { return break_alarm; } diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index d8c25e3..9749e32 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -11,7 +11,6 @@ import com.casic.br.operationsite.test.util.RuntimeCache import com.casic.br.operationsite.test.util.VideoPlayerManager import com.casic.br.operationsite.test.util.tcp.SocketManager -import com.casic.br.operationsite.test.vm.AirViewModel import com.casic.br.operationsite.test.vm.ConstructionCheckViewModel import com.casic.br.operationsite.test.vm.SceneViewModel import com.casic.br.operationsite.test.widget.AllCommandSheet @@ -22,16 +21,14 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class DisclosureActivity : KotlinBaseActivity() { private val kTag = "DisclosureActivity" private lateinit var constructionCheckViewModel: ConstructionCheckViewModel private lateinit var sceneViewModel: SceneViewModel - private lateinit var airViewModel: AirViewModel override fun initEvent() { binding.startCheckButton.setOnClickListener { @@ -51,23 +48,25 @@ BottomControlSheet(this).show() } - binding.checkAirButton.setOnClickListener { - //通知后台可以返回四合一数据了 - airViewModel.getAirCondition(this) - } - binding.confirmAirButton.setOnClickListener { - if (!SocketManager.get.nettyClient.connectStatus) { - "指令发送失败，请确认是否处于同一网段".show(this) - return@setOnClickListener - } - sceneViewModel.notifyStageFinished(null, "Environment") + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("请确认作业气体检测完成？").setNegativeButton("取消") + .setPositiveButton("确定").setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + sceneViewModel.notifyStageFinished(null, "Environment") - //下发指令 - SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) + //下发指令 + SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) - //跳转 - navigatePageTo() + //跳转 + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() } } @@ -76,32 +75,6 @@ constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] - airViewModel = ViewModelProvider(this)[AirViewModel::class.java] - airViewModel.airConditionResult.observe(this) { - if (it.code == 200) { - //绑定数据 - it.data[0].apply { - binding.firstCOValueView.text = "一氧化碳：${co}ppm" - binding.firstCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.firstH2SValueView.text = "硫化氢：${co}ppm" - binding.firstO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[1].apply { - binding.secondCOValueView.text = "一氧化碳：${co}ppm" - binding.secondCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.secondH2SValueView.text = "硫化氢：${co}ppm" - binding.secondO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[2].apply { - binding.thirdCOValueView.text = "一氧化碳：${co}ppm" - binding.thirdCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.thirdH2SValueView.text = "硫化氢：${co}ppm" - binding.thirdO2ValueView.text = "氧气：${o2}%VOL" - } - } - } //动态设置rtspPlayerView宽高 val rtspViewParams = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams @@ -121,12 +94,7 @@ } override fun observeRequestState() { - airViewModel.loadState.observe(this) { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "获取四合一数据中，请稍后...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/build.gradle b/app/build.gradle index fbd479f..361554e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ applicationId "com.casic.br.operationsite.test" minSdkVersion 23 targetSdkVersion 33 - versionCode 1070 - versionName "1.0.7.0" + versionCode 1080 + versionName "1.0.8.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java index 5e458f1..46c17e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java @@ -31,11 +31,29 @@ } public static class DataModel { + private String extinguisher_alarm; + private String blower_alarm; private String break_alarm; private String no_supervisor_alarm; private String smoke_alarm; private double smoke_conf; + public String getExtinguisher_alarm() { + return extinguisher_alarm; + } + + public void setExtinguisher_alarm(String extinguisher_alarm) { + this.extinguisher_alarm = extinguisher_alarm; + } + + public String getBlower_alarm() { + return blower_alarm; + } + + public void setBlower_alarm(String blower_alarm) { + this.blower_alarm = blower_alarm; + } + public String getBreak_alarm() { return break_alarm; } diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index d8c25e3..9749e32 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -11,7 +11,6 @@ import com.casic.br.operationsite.test.util.RuntimeCache import com.casic.br.operationsite.test.util.VideoPlayerManager import com.casic.br.operationsite.test.util.tcp.SocketManager -import com.casic.br.operationsite.test.vm.AirViewModel import com.casic.br.operationsite.test.vm.ConstructionCheckViewModel import com.casic.br.operationsite.test.vm.SceneViewModel import com.casic.br.operationsite.test.widget.AllCommandSheet @@ -22,16 +21,14 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class DisclosureActivity : KotlinBaseActivity() { private val kTag = "DisclosureActivity" private lateinit var constructionCheckViewModel: ConstructionCheckViewModel private lateinit var sceneViewModel: SceneViewModel - private lateinit var airViewModel: AirViewModel override fun initEvent() { binding.startCheckButton.setOnClickListener { @@ -51,23 +48,25 @@ BottomControlSheet(this).show() } - binding.checkAirButton.setOnClickListener { - //通知后台可以返回四合一数据了 - airViewModel.getAirCondition(this) - } - binding.confirmAirButton.setOnClickListener { - if (!SocketManager.get.nettyClient.connectStatus) { - "指令发送失败，请确认是否处于同一网段".show(this) - return@setOnClickListener - } - sceneViewModel.notifyStageFinished(null, "Environment") + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("请确认作业气体检测完成？").setNegativeButton("取消") + .setPositiveButton("确定").setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + sceneViewModel.notifyStageFinished(null, "Environment") - //下发指令 - SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) + //下发指令 + SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) - //跳转 - navigatePageTo() + //跳转 + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() } } @@ -76,32 +75,6 @@ constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] - airViewModel = ViewModelProvider(this)[AirViewModel::class.java] - airViewModel.airConditionResult.observe(this) { - if (it.code == 200) { - //绑定数据 - it.data[0].apply { - binding.firstCOValueView.text = "一氧化碳：${co}ppm" - binding.firstCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.firstH2SValueView.text = "硫化氢：${co}ppm" - binding.firstO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[1].apply { - binding.secondCOValueView.text = "一氧化碳：${co}ppm" - binding.secondCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.secondH2SValueView.text = "硫化氢：${co}ppm" - binding.secondO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[2].apply { - binding.thirdCOValueView.text = "一氧化碳：${co}ppm" - binding.thirdCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.thirdH2SValueView.text = "硫化氢：${co}ppm" - binding.thirdO2ValueView.text = "氧气：${o2}%VOL" - } - } - } //动态设置rtspPlayerView宽高 val rtspViewParams = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams @@ -121,12 +94,7 @@ } override fun observeRequestState() { - airViewModel.loadState.observe(this) { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "获取四合一数据中，请稍后...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index fa85f03..de30dc1 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -71,6 +71,32 @@ ) } + binding.extinguisherCheckbox.setOnCheckedChangeListener { _, isChecked -> + val state = if (isChecked) { + "1" + } else { + "0" + } + + alarmViewModel.changeOtherAlarmState( + LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP, + "extinguisher", "", state + ) + } + + binding.blowerCheckbox.setOnCheckedChangeListener { _, isChecked -> + val state = if (isChecked) { + "1" + } else { + "0" + } + + alarmViewModel.changeOtherAlarmState( + LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP, + "blower", "", state + ) + } + binding.noneSupervisorCheckbox.setOnCheckedChangeListener { _, isChecked -> val state = if (isChecked) { "1" @@ -193,7 +219,7 @@ //动态设置rtspPlayerView宽高 val rtspViewParams = binding.rtspPlayerView.layoutParams as FrameLayout.LayoutParams - val videoWidth = getScreenWidth() - 30.dp2px(this) + val videoWidth = getScreenWidth() - 20.dp2px(this) val videoHeight = videoWidth * (9f / 16) rtspViewParams.width = videoWidth rtspViewParams.height = videoHeight.toInt() @@ -221,6 +247,8 @@ alarmViewModel.otherStateResult.observe(this) { result -> if (result.code == 200) { result.data.let { + binding.extinguisherCheckbox.isChecked = it.extinguisher_alarm == "1" + binding.blowerCheckbox.isChecked = it.blower_alarm == "1" binding.noneSupervisorCheckbox.isChecked = it.no_supervisor_alarm == "1" binding.intrudeCheckbox.isChecked = it.break_alarm == "1" binding.smokeCheckbox.isChecked = it.smoke_alarm == "1" @@ -245,17 +273,6 @@ workSiteViewModel.workerResult.observe(this) { if (it.code == 200) { it.data.first().apply { - binding.heartRateView.text = "心率：${heartRate}bpm" - binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" - binding.coValueView.text = "一氧化碳：${co}ppm" - binding.gasValueView.text = "可燃气：${gas}%LEL" - binding.h2sValueView.text = "硫化氢：${h2s}ppm" - binding.o2ValueView.text = "氧气：${o2}%VOL" - binding.valueUpdateView.text = "更新时间：${gasTime}" - - Log.d(kTag, "heartRate, bloodOxygen, co, gas, h2s, o2") - Log.d(kTag, "$heartRate, $bloodOxygen, $co, $gas, $h2s, $o2") - if (gas.toFloat().toInt() >= 5 && SocketManager.get.nettyClient.connectStatus ) { diff --git a/app/build.gradle b/app/build.gradle index fbd479f..361554e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ applicationId "com.casic.br.operationsite.test" minSdkVersion 23 targetSdkVersion 33 - versionCode 1070 - versionName "1.0.7.0" + versionCode 1080 + versionName "1.0.8.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java index 5e458f1..46c17e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java +++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java @@ -31,11 +31,29 @@ } public static class DataModel { + private String extinguisher_alarm; + private String blower_alarm; private String break_alarm; private String no_supervisor_alarm; private String smoke_alarm; private double smoke_conf; + public String getExtinguisher_alarm() { + return extinguisher_alarm; + } + + public void setExtinguisher_alarm(String extinguisher_alarm) { + this.extinguisher_alarm = extinguisher_alarm; + } + + public String getBlower_alarm() { + return blower_alarm; + } + + public void setBlower_alarm(String blower_alarm) { + this.blower_alarm = blower_alarm; + } + public String getBreak_alarm() { return break_alarm; } diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index d8c25e3..9749e32 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -11,7 +11,6 @@ import com.casic.br.operationsite.test.util.RuntimeCache import com.casic.br.operationsite.test.util.VideoPlayerManager import com.casic.br.operationsite.test.util.tcp.SocketManager -import com.casic.br.operationsite.test.vm.AirViewModel import com.casic.br.operationsite.test.vm.ConstructionCheckViewModel import com.casic.br.operationsite.test.vm.SceneViewModel import com.casic.br.operationsite.test.widget.AllCommandSheet @@ -22,16 +21,14 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class DisclosureActivity : KotlinBaseActivity() { private val kTag = "DisclosureActivity" private lateinit var constructionCheckViewModel: ConstructionCheckViewModel private lateinit var sceneViewModel: SceneViewModel - private lateinit var airViewModel: AirViewModel override fun initEvent() { binding.startCheckButton.setOnClickListener { @@ -51,23 +48,25 @@ BottomControlSheet(this).show() } - binding.checkAirButton.setOnClickListener { - //通知后台可以返回四合一数据了 - airViewModel.getAirCondition(this) - } - binding.confirmAirButton.setOnClickListener { - if (!SocketManager.get.nettyClient.connectStatus) { - "指令发送失败，请确认是否处于同一网段".show(this) - return@setOnClickListener - } - sceneViewModel.notifyStageFinished(null, "Environment") + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("请确认作业气体检测完成？").setNegativeButton("取消") + .setPositiveButton("确定").setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + sceneViewModel.notifyStageFinished(null, "Environment") - //下发指令 - SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) + //下发指令 + SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) - //跳转 - navigatePageTo() + //跳转 + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() } } @@ -76,32 +75,6 @@ constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] - airViewModel = ViewModelProvider(this)[AirViewModel::class.java] - airViewModel.airConditionResult.observe(this) { - if (it.code == 200) { - //绑定数据 - it.data[0].apply { - binding.firstCOValueView.text = "一氧化碳：${co}ppm" - binding.firstCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.firstH2SValueView.text = "硫化氢：${co}ppm" - binding.firstO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[1].apply { - binding.secondCOValueView.text = "一氧化碳：${co}ppm" - binding.secondCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.secondH2SValueView.text = "硫化氢：${co}ppm" - binding.secondO2ValueView.text = "氧气：${o2}%VOL" - } - - it.data[2].apply { - binding.thirdCOValueView.text = "一氧化碳：${co}ppm" - binding.thirdCH4ValueView.text = "可燃气：${ch4}%LEL" - binding.thirdH2SValueView.text = "硫化氢：${co}ppm" - binding.thirdO2ValueView.text = "氧气：${o2}%VOL" - } - } - } //动态设置rtspPlayerView宽高 val rtspViewParams = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams @@ -121,12 +94,7 @@ } override fun observeRequestState() { - airViewModel.loadState.observe(this) { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "获取四合一数据中，请稍后...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index fa85f03..de30dc1 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -71,6 +71,32 @@ ) } + binding.extinguisherCheckbox.setOnCheckedChangeListener { _, isChecked -> + val state = if (isChecked) { + "1" + } else { + "0" + } + + alarmViewModel.changeOtherAlarmState( + LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP, + "extinguisher", "", state + ) + } + + binding.blowerCheckbox.setOnCheckedChangeListener { _, isChecked -> + val state = if (isChecked) { + "1" + } else { + "0" + } + + alarmViewModel.changeOtherAlarmState( + LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP, + "blower", "", state + ) + } + binding.noneSupervisorCheckbox.setOnCheckedChangeListener { _, isChecked -> val state = if (isChecked) { "1" @@ -193,7 +219,7 @@ //动态设置rtspPlayerView宽高 val rtspViewParams = binding.rtspPlayerView.layoutParams as FrameLayout.LayoutParams - val videoWidth = getScreenWidth() - 30.dp2px(this) + val videoWidth = getScreenWidth() - 20.dp2px(this) val videoHeight = videoWidth * (9f / 16) rtspViewParams.width = videoWidth rtspViewParams.height = videoHeight.toInt() @@ -221,6 +247,8 @@ alarmViewModel.otherStateResult.observe(this) { result -> if (result.code == 200) { result.data.let { + binding.extinguisherCheckbox.isChecked = it.extinguisher_alarm == "1" + binding.blowerCheckbox.isChecked = it.blower_alarm == "1" binding.noneSupervisorCheckbox.isChecked = it.no_supervisor_alarm == "1" binding.intrudeCheckbox.isChecked = it.break_alarm == "1" binding.smokeCheckbox.isChecked = it.smoke_alarm == "1" @@ -245,17 +273,6 @@ workSiteViewModel.workerResult.observe(this) { if (it.code == 200) { it.data.first().apply { - binding.heartRateView.text = "心率：${heartRate}bpm" - binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" - binding.coValueView.text = "一氧化碳：${co}ppm" - binding.gasValueView.text = "可燃气：${gas}%LEL" - binding.h2sValueView.text = "硫化氢：${h2s}ppm" - binding.o2ValueView.text = "氧气：${o2}%VOL" - binding.valueUpdateView.text = "更新时间：${gasTime}" - - Log.d(kTag, "heartRate, bloodOxygen, co, gas, h2s, o2") - Log.d(kTag, "$heartRate, $bloodOxygen, $co, $gas, $h2s, $o2") - if (gas.toFloat().toInt() >= 5 && SocketManager.get.nettyClient.connectStatus ) { diff --git a/app/src/main/res/layout/activity_disclosure.xml b/app/src/main/res/layout/activity_disclosure.xml index 16d52ff..c8fc741 100644 --- a/app/src/main/res/layout/activity_disclosure.xml +++ b/app/src/main/res/layout/activity_disclosure.xml @@ -70,219 +70,18 @@ android:clickable="false" android:focusable="false" /> -