diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index c9b3dc7..48f6b89 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -23,6 +23,7 @@ import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.isNumber import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -277,22 +278,29 @@ } binding.taskSettingsButton.setOnClickListener { + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") .setSubLayoutVisibility(true) .setSubTitle("原报警阈值") - .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) + .setOldValue(threshold.toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value) - alarmViewModel.addAlarmRule( - value, deviceId, System.currentTimeMillis().timestampToCompleteDate() - ) + if (value.isNumber()) { + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value.toInt()) + alarmViewModel.addAlarmRule( + value, + deviceId, + System.currentTimeMillis().timestampToCompleteDate() + ) + } else { + "请输入正确的数字".show(requireContext()) + } } override fun onCancelClick() {} diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index c9b3dc7..48f6b89 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -23,6 +23,7 @@ import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.isNumber import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -277,22 +278,29 @@ } binding.taskSettingsButton.setOnClickListener { + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") .setSubLayoutVisibility(true) .setSubTitle("原报警阈值") - .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) + .setOldValue(threshold.toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value) - alarmViewModel.addAlarmRule( - value, deviceId, System.currentTimeMillis().timestampToCompleteDate() - ) + if (value.isNumber()) { + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value.toInt()) + alarmViewModel.addAlarmRule( + value, + deviceId, + System.currentTimeMillis().timestampToCompleteDate() + ) + } else { + "请输入正确的数字".show(requireContext()) + } } override fun onCancelClick() {} diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt index f699c65..7cfb21e 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt @@ -46,7 +46,6 @@ const val SERVER_BASE_URL = "http://111.198.10.15:11646" const val CAR_NUMBER = "carNumber" const val CAR_ID = "carId" - const val ALARM_RULE = "alarmRule" const val YT_DEVICE_ID = "deviceId" //海康摄像头参数 diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index c9b3dc7..48f6b89 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -23,6 +23,7 @@ import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.isNumber import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -277,22 +278,29 @@ } binding.taskSettingsButton.setOnClickListener { + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") .setSubLayoutVisibility(true) .setSubTitle("原报警阈值") - .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) + .setOldValue(threshold.toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value) - alarmViewModel.addAlarmRule( - value, deviceId, System.currentTimeMillis().timestampToCompleteDate() - ) + if (value.isNumber()) { + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value.toInt()) + alarmViewModel.addAlarmRule( + value, + deviceId, + System.currentTimeMillis().timestampToCompleteDate() + ) + } else { + "请输入正确的数字".show(requireContext()) + } } override fun onCancelClick() {} diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt index f699c65..7cfb21e 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt @@ -46,7 +46,6 @@ const val SERVER_BASE_URL = "http://111.198.10.15:11646" const val CAR_NUMBER = "carNumber" const val CAR_ID = "carId" - const val ALARM_RULE = "alarmRule" const val YT_DEVICE_ID = "deviceId" //海康摄像头参数 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 dc7ca45..3667697 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 @@ -51,6 +51,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration import com.pengxh.kt.lite.extensions.createImageFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -175,7 +176,7 @@ val taskTitle = intent.getStringExtra(Constant.INTENT_PARAM).toString() val carId = SaveKeyValues.getValue(LocaleConstant.CAR_ID, "") as String - gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String //初始化任务 @@ -338,10 +339,16 @@ viewHolder: ViewHolder, position: Int, item: AlarmListModel.DataModel.RowsModel ) { + if (position == 0) { + viewHolder.setTextColor(R.id.alarmTypeView, Color.RED) + .setTextColor(R.id.alarmTimeView, Color.RED) + } + viewHolder.setText(R.id.alarmTypeView, item.recognitionType) .setText(R.id.alarmTimeView, item.alarmTime) } } + binding.videoAlarmView.addItemDecoration(VerticalMarginItemDecoration(0, 1)) binding.videoAlarmView.adapter = videoAlarmAdapter } } @@ -982,7 +989,7 @@ //配置预览SurfaceView binding.videoSurfaceView.holder.addCallback(this) binding.videoSurfaceView.setZOrderOnTop(true) - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int binding.alarmThresholdView.text = String.format("${threshold}ppm·m") //折线图初始化阈值线 binding.methaneLineChart.init() diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index c9b3dc7..48f6b89 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -23,6 +23,7 @@ import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.isNumber import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -277,22 +278,29 @@ } binding.taskSettingsButton.setOnClickListener { + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") .setSubLayoutVisibility(true) .setSubTitle("原报警阈值") - .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) + .setOldValue(threshold.toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value) - alarmViewModel.addAlarmRule( - value, deviceId, System.currentTimeMillis().timestampToCompleteDate() - ) + if (value.isNumber()) { + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value.toInt()) + alarmViewModel.addAlarmRule( + value, + deviceId, + System.currentTimeMillis().timestampToCompleteDate() + ) + } else { + "请输入正确的数字".show(requireContext()) + } } override fun onCancelClick() {} diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt index f699c65..7cfb21e 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt @@ -46,7 +46,6 @@ const val SERVER_BASE_URL = "http://111.198.10.15:11646" const val CAR_NUMBER = "carNumber" const val CAR_ID = "carId" - const val ALARM_RULE = "alarmRule" const val YT_DEVICE_ID = "deviceId" //海康摄像头参数 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 dc7ca45..3667697 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 @@ -51,6 +51,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration import com.pengxh.kt.lite.extensions.createImageFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -175,7 +176,7 @@ val taskTitle = intent.getStringExtra(Constant.INTENT_PARAM).toString() val carId = SaveKeyValues.getValue(LocaleConstant.CAR_ID, "") as String - gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String //初始化任务 @@ -338,10 +339,16 @@ viewHolder: ViewHolder, position: Int, item: AlarmListModel.DataModel.RowsModel ) { + if (position == 0) { + viewHolder.setTextColor(R.id.alarmTypeView, Color.RED) + .setTextColor(R.id.alarmTimeView, Color.RED) + } + viewHolder.setText(R.id.alarmTypeView, item.recognitionType) .setText(R.id.alarmTimeView, item.alarmTime) } } + binding.videoAlarmView.addItemDecoration(VerticalMarginItemDecoration(0, 1)) binding.videoAlarmView.adapter = videoAlarmAdapter } } @@ -982,7 +989,7 @@ //配置预览SurfaceView binding.videoSurfaceView.holder.addCallback(this) binding.videoSurfaceView.setZOrderOnTop(true) - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int binding.alarmThresholdView.text = String.format("${threshold}ppm·m") //折线图初始化阈值线 binding.methaneLineChart.init() diff --git a/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt b/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt index b3c519a..72c42ff 100644 --- a/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt @@ -75,7 +75,7 @@ if (it.code == 200) { if (it.data.rows.isNotEmpty()) { val model = it.data.rows[0] - SaveKeyValues.putValue(LocaleConstant.ALARM_RULE, model.high) + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, model.high) SaveKeyValues.putValue(LocaleConstant.YT_DEVICE_ID, model.deviceId) } else { Log.d(kTag, "initData => 无可用报警规则") diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 02093f3..fd90e69 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -79,7 +79,7 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 7fbbf1d..f9f142a 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -29,7 +29,7 @@ leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int val limitLine = LimitLine(threshold.toFloat(), "阈值：${threshold}ppm·m") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index c9b3dc7..48f6b89 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -23,6 +23,7 @@ import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.isNumber import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -277,22 +278,29 @@ } binding.taskSettingsButton.setOnClickListener { + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") .setSubLayoutVisibility(true) .setSubTitle("原报警阈值") - .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) + .setOldValue(threshold.toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value) - alarmViewModel.addAlarmRule( - value, deviceId, System.currentTimeMillis().timestampToCompleteDate() - ) + if (value.isNumber()) { + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, value.toInt()) + alarmViewModel.addAlarmRule( + value, + deviceId, + System.currentTimeMillis().timestampToCompleteDate() + ) + } else { + "请输入正确的数字".show(requireContext()) + } } override fun onCancelClick() {} diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt index f699c65..7cfb21e 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt @@ -46,7 +46,6 @@ const val SERVER_BASE_URL = "http://111.198.10.15:11646" const val CAR_NUMBER = "carNumber" const val CAR_ID = "carId" - const val ALARM_RULE = "alarmRule" const val YT_DEVICE_ID = "deviceId" //海康摄像头参数 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 dc7ca45..3667697 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 @@ -51,6 +51,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration import com.pengxh.kt.lite.extensions.createImageFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -175,7 +176,7 @@ val taskTitle = intent.getStringExtra(Constant.INTENT_PARAM).toString() val carId = SaveKeyValues.getValue(LocaleConstant.CAR_ID, "") as String - gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int deviceId = SaveKeyValues.getValue(LocaleConstant.YT_DEVICE_ID, "") as String //初始化任务 @@ -338,10 +339,16 @@ viewHolder: ViewHolder, position: Int, item: AlarmListModel.DataModel.RowsModel ) { + if (position == 0) { + viewHolder.setTextColor(R.id.alarmTypeView, Color.RED) + .setTextColor(R.id.alarmTimeView, Color.RED) + } + viewHolder.setText(R.id.alarmTypeView, item.recognitionType) .setText(R.id.alarmTimeView, item.alarmTime) } } + binding.videoAlarmView.addItemDecoration(VerticalMarginItemDecoration(0, 1)) binding.videoAlarmView.adapter = videoAlarmAdapter } } @@ -982,7 +989,7 @@ //配置预览SurfaceView binding.videoSurfaceView.holder.addCallback(this) binding.videoSurfaceView.setZOrderOnTop(true) - val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int binding.alarmThresholdView.text = String.format("${threshold}ppm·m") //折线图初始化阈值线 binding.methaneLineChart.init() diff --git a/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt b/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt index b3c519a..72c42ff 100644 --- a/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/MainActivity.kt @@ -75,7 +75,7 @@ if (it.code == 200) { if (it.data.rows.isNotEmpty()) { val model = it.data.rows[0] - SaveKeyValues.putValue(LocaleConstant.ALARM_RULE, model.high) + SaveKeyValues.putValue(LocaleConstant.ALARM_THRESHOLD, model.high) SaveKeyValues.putValue(LocaleConstant.YT_DEVICE_ID, model.deviceId) } else { Log.d(kTag, "initData => 无可用报警规则") 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 34ea1b2..1f82912 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 @@ -128,9 +128,8 @@ detailModel.message = "请求成功" val dataModel = AlarmDetailModel.DataModel() dataModel.alarmPicture = "" - dataModel.alarmThresh = SaveKeyValues.getValue( - LocaleConstant.ALARM_RULE, 1000 - ).toString() + val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, 1000) as Int + dataModel.alarmThresh = threshold.toString() dataModel.alarmValue = "0" dataModel.alarmVideo = "" detailModel.data = dataModel