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 696c49d..0f7d87b 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 @@ -129,6 +129,9 @@ //甲烷浓度阈值 private var gasAlarmRule = 1000 + //存储最新的报警浓度 + private val gasStack = Stack() + override fun initViewBinding(): ActivityInspectionBinding { return ActivityInspectionBinding.inflate(layoutInflater) } @@ -263,20 +266,22 @@ fileViewModel.resultModel.observe(this) { if (it.code == 200) { - alarmViewModel.addAlarm( - taskId, - deviceId, - "甲烷浓度超过阈值", - lat, - lng, - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - it.data, - "0", - "1", - "", - dataModel?.methane.toString(), - ) + if (gasStack.isNotEmpty()) { + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + gasStack.pop().toString(), + ) + } } } @@ -643,7 +648,6 @@ } /** - * TODO 未实测 * 录制视频,本地录制30min视频 * */ private val videoCountDownTimer = object : CountDownTimer(30 * 60 * 1000, 1000) { @@ -915,6 +919,7 @@ dataModel = model if (model.methane >= gasAlarmRule) { + gasStack.push(model.methane) isAlarm = "1" /**