diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 75f989b..ee8c2c3 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -69,15 +69,12 @@ item.alarmTime } - val alarmState: String - if (item.alarmStatus == "0") { - alarmState = "正在报警" + if (item.alarmStatus == "未处置") { holder.setBackgroundColor( R.id.alarmStateView, R.color.red.convertColor(ctx) ) } else { - alarmState = "已处置" holder.setBackgroundColor( R.id.alarmStateView, R.color.green.convertColor(ctx) @@ -116,7 +113,7 @@ .setText(R.id.alarmTimeView, alarmTime) .setText(R.id.alarmTypeView, item.alarmType.toChineseType()) .setText(R.id.alarmValueView, alarmValue) - .setText(R.id.alarmStateView, alarmState) + .setText(R.id.alarmStateView, item.alarmStatus) .setOnClickListener(R.id.handleAlarmButton) { itemClickedListener?.onHandleButtonClicked(item) } diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 75f989b..ee8c2c3 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -69,15 +69,12 @@ item.alarmTime } - val alarmState: String - if (item.alarmStatus == "0") { - alarmState = "正在报警" + if (item.alarmStatus == "未处置") { holder.setBackgroundColor( R.id.alarmStateView, R.color.red.convertColor(ctx) ) } else { - alarmState = "已处置" holder.setBackgroundColor( R.id.alarmStateView, R.color.green.convertColor(ctx) @@ -116,7 +113,7 @@ .setText(R.id.alarmTimeView, alarmTime) .setText(R.id.alarmTypeView, item.alarmType.toChineseType()) .setText(R.id.alarmValueView, alarmValue) - .setText(R.id.alarmStateView, alarmState) + .setText(R.id.alarmStateView, item.alarmStatus) .setOnClickListener(R.id.handleAlarmButton) { itemClickedListener?.onHandleButtonClicked(item) } diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml index dcfca23..499529c 100644 --- a/app/src/main/res/layout/item_alarm_rv_l.xml +++ b/app/src/main/res/layout/item_alarm_rv_l.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_15" - android:layout_weight="1" + android:layout_weight="0.75" android:paddingVertical="@dimen/dp_5" android:text="已处置" android:textColor="@color/white" diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 75f989b..ee8c2c3 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -69,15 +69,12 @@ item.alarmTime } - val alarmState: String - if (item.alarmStatus == "0") { - alarmState = "正在报警" + if (item.alarmStatus == "未处置") { holder.setBackgroundColor( R.id.alarmStateView, R.color.red.convertColor(ctx) ) } else { - alarmState = "已处置" holder.setBackgroundColor( R.id.alarmStateView, R.color.green.convertColor(ctx) @@ -116,7 +113,7 @@ .setText(R.id.alarmTimeView, alarmTime) .setText(R.id.alarmTypeView, item.alarmType.toChineseType()) .setText(R.id.alarmValueView, alarmValue) - .setText(R.id.alarmStateView, alarmState) + .setText(R.id.alarmStateView, item.alarmStatus) .setOnClickListener(R.id.handleAlarmButton) { itemClickedListener?.onHandleButtonClicked(item) } diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml index dcfca23..499529c 100644 --- a/app/src/main/res/layout/item_alarm_rv_l.xml +++ b/app/src/main/res/layout/item_alarm_rv_l.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_15" - android:layout_weight="1" + android:layout_weight="0.75" android:paddingVertical="@dimen/dp_5" android:text="已处置" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_alarm_rv_l_title.xml b/app/src/main/res/layout/item_alarm_rv_l_title.xml index bb590d7..1cad01a 100644 --- a/app/src/main/res/layout/item_alarm_rv_l_title.xml +++ b/app/src/main/res/layout/item_alarm_rv_l_title.xml @@ -35,6 +35,7 @@ 请选择处置状态 - 正在报警 未处置 + 已处置