diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
index 5399670..b96fac1 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
@@ -16,6 +16,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.extensions.convertColor
 import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
@@ -138,7 +139,13 @@
                                 item.alarmTime.formatToDate()
                             }
 
+                            val color = when (item.alarmStatus) {
+                                "正在报警" -> R.color.redTextColor.convertColor(this@AlarmListActivity)
+                                else -> R.color.greenColor.convertColor(this@AlarmListActivity)
+                            }
+
                             viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setBackgroundColor(R.id.alarmStatusView, color)
                                 .setText(R.id.alarmContentView, item.alarmContent)
                                 .setText(R.id.workRoadView, item.workRoad)
                                 .setText(R.id.alarmTimeView, diffTime)

diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
index 5399670..b96fac1 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
@@ -16,6 +16,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.extensions.convertColor
 import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
@@ -138,7 +139,13 @@
                                 item.alarmTime.formatToDate()
                             }
 
+                            val color = when (item.alarmStatus) {
+                                "正在报警" -> R.color.redTextColor.convertColor(this@AlarmListActivity)
+                                else -> R.color.greenColor.convertColor(this@AlarmListActivity)
+                            }
+
                             viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setBackgroundColor(R.id.alarmStatusView, color)
                                 .setText(R.id.alarmContentView, item.alarmContent)
                                 .setText(R.id.workRoadView, item.workRoad)
                                 .setText(R.id.alarmTimeView, diffTime)
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index 13b47f2..e638e48 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -25,18 +25,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <androidx.core.widget.NestedScrollView
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/alarmRecyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fillViewport="true"
-                android:scrollbars="vertical">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/alarmRecyclerView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-            </androidx.core.widget.NestedScrollView>
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <com.scwang.smartrefresh.layout.footer.ClassicsFooter
                 android:layout_width="match_parent"