diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true
diff --git a/app/src/main/res/drawable/ic_alarm_location.xml b/app/src/main/res/drawable/ic_alarm_location.xml
index 3b1513c..3d487ef 100644
--- a/app/src/main/res/drawable/ic_alarm_location.xml
+++ b/app/src/main/res/drawable/ic_alarm_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48px"
-    android:height="48px"
+    android:width="40px"
+    android:height="40px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/subTextColor"
+        android:fillColor="@color/hintTextColor"
         android:pathData="M512,64C317.92,64 160,221.92 160,416c0,187.36 315.42,520.03 328.83,534.08C494.88,956.45 503.26,960 512,960c0.22,0 0.48,0 0.7,0 8.99,0 17.47,-4.19 23.39,-10.94l109.22,-125.12C790.43,646.18 864,508.93 864,416 864,221.92 706.08,64 512,64zM512,576c-88.38,0 -160,-71.62 -160,-160s71.62,-160 160,-160 160,71.62 160,160S600.38,576 512,576z" />
 </vector>

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true
diff --git a/app/src/main/res/drawable/ic_alarm_location.xml b/app/src/main/res/drawable/ic_alarm_location.xml
index 3b1513c..3d487ef 100644
--- a/app/src/main/res/drawable/ic_alarm_location.xml
+++ b/app/src/main/res/drawable/ic_alarm_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48px"
-    android:height="48px"
+    android:width="40px"
+    android:height="40px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/subTextColor"
+        android:fillColor="@color/hintTextColor"
         android:pathData="M512,64C317.92,64 160,221.92 160,416c0,187.36 315.42,520.03 328.83,534.08C494.88,956.45 503.26,960 512,960c0.22,0 0.48,0 0.7,0 8.99,0 17.47,-4.19 23.39,-10.94l109.22,-125.12C790.43,646.18 864,508.93 864,416 864,221.92 706.08,64 512,64zM512,576c-88.38,0 -160,-71.62 -160,-160s71.62,-160 160,-160 160,71.62 160,160S600.38,576 512,576z" />
 </vector>
diff --git a/app/src/main/res/layout/item_alarm_rv.xml b/app/src/main/res/layout/item_alarm_rv.xml
deleted file mode 100644
index a1b9e65..0000000
--- a/app/src/main/res/layout/item_alarm_rv.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="@dimen/dp_10"
-    android:paddingVertical="@dimen/dp_5">
-
-    <TextView
-        android:id="@+id/groupNameView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="城投湖畔四季城一期中坝七号地块"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:orientation="horizontal">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectAreaView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="盘龙区"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/greenColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectTypeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="品茗"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/orangeTextColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/projectLocationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_5"
-        android:text="昆明市盘龙区盘江西路与中坝路"
-        android:textColor="@color/subTextColor"
-        app:drawableStartCompat="@drawable/ic_alarm_location" />
-</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true
diff --git a/app/src/main/res/drawable/ic_alarm_location.xml b/app/src/main/res/drawable/ic_alarm_location.xml
index 3b1513c..3d487ef 100644
--- a/app/src/main/res/drawable/ic_alarm_location.xml
+++ b/app/src/main/res/drawable/ic_alarm_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48px"
-    android:height="48px"
+    android:width="40px"
+    android:height="40px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/subTextColor"
+        android:fillColor="@color/hintTextColor"
         android:pathData="M512,64C317.92,64 160,221.92 160,416c0,187.36 315.42,520.03 328.83,534.08C494.88,956.45 503.26,960 512,960c0.22,0 0.48,0 0.7,0 8.99,0 17.47,-4.19 23.39,-10.94l109.22,-125.12C790.43,646.18 864,508.93 864,416 864,221.92 706.08,64 512,64zM512,576c-88.38,0 -160,-71.62 -160,-160s71.62,-160 160,-160 160,71.62 160,160S600.38,576 512,576z" />
 </vector>
diff --git a/app/src/main/res/layout/item_alarm_rv.xml b/app/src/main/res/layout/item_alarm_rv.xml
deleted file mode 100644
index a1b9e65..0000000
--- a/app/src/main/res/layout/item_alarm_rv.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="@dimen/dp_10"
-    android:paddingVertical="@dimen/dp_5">
-
-    <TextView
-        android:id="@+id/groupNameView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="城投湖畔四季城一期中坝七号地块"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:orientation="horizontal">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectAreaView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="盘龙区"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/greenColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectTypeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="品茗"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/orangeTextColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/projectLocationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_5"
-        android:text="昆明市盘龙区盘江西路与中坝路"
-        android:textColor="@color/subTextColor"
-        app:drawableStartCompat="@drawable/ic_alarm_location" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml
new file mode 100644
index 0000000..ef11c7a
--- /dev/null
+++ b/app/src/main/res/layout/item_alarm_rv_l.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="90dp"
+    android:orientation="horizontal"
+    android:padding="5dp">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/alarmStatusView"
+            style="@style/TagStyle"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="正在报警"
+            app:qmui_backgroundColor="@color/redTextColor" />
+
+        <TextView
+            android:id="@+id/alarmContentView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="5dp"
+            android:layout_toEndOf="@id/alarmStatusView"
+            android:text="甲烷浓度超限"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginHorizontal="5dp"
+            android:text="1000"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/workRoadView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toStartOf="@id/alarmTimeView"
+            android:drawablePadding="@dimen/dp_5"
+            android:singleLine="true"
+            android:text="永定路"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12"
+            app:drawableStartCompat="@drawable/ic_alarm_location" />
+
+        <TextView
+            android:id="@+id/alarmTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="5dp"
+            android:text="2小时前"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
+
+    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+        android:id="@+id/alarmImageView"
+        android:layout_width="100dp"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/load_image_error"
+        app:qmui_border_width="0dp"
+        app:qmui_corner_radius="5dp" />
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true
diff --git a/app/src/main/res/drawable/ic_alarm_location.xml b/app/src/main/res/drawable/ic_alarm_location.xml
index 3b1513c..3d487ef 100644
--- a/app/src/main/res/drawable/ic_alarm_location.xml
+++ b/app/src/main/res/drawable/ic_alarm_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48px"
-    android:height="48px"
+    android:width="40px"
+    android:height="40px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/subTextColor"
+        android:fillColor="@color/hintTextColor"
         android:pathData="M512,64C317.92,64 160,221.92 160,416c0,187.36 315.42,520.03 328.83,534.08C494.88,956.45 503.26,960 512,960c0.22,0 0.48,0 0.7,0 8.99,0 17.47,-4.19 23.39,-10.94l109.22,-125.12C790.43,646.18 864,508.93 864,416 864,221.92 706.08,64 512,64zM512,576c-88.38,0 -160,-71.62 -160,-160s71.62,-160 160,-160 160,71.62 160,160S600.38,576 512,576z" />
 </vector>
diff --git a/app/src/main/res/layout/item_alarm_rv.xml b/app/src/main/res/layout/item_alarm_rv.xml
deleted file mode 100644
index a1b9e65..0000000
--- a/app/src/main/res/layout/item_alarm_rv.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="@dimen/dp_10"
-    android:paddingVertical="@dimen/dp_5">
-
-    <TextView
-        android:id="@+id/groupNameView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="城投湖畔四季城一期中坝七号地块"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:orientation="horizontal">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectAreaView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="盘龙区"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/greenColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectTypeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="品茗"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/orangeTextColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/projectLocationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_5"
-        android:text="昆明市盘龙区盘江西路与中坝路"
-        android:textColor="@color/subTextColor"
-        app:drawableStartCompat="@drawable/ic_alarm_location" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml
new file mode 100644
index 0000000..ef11c7a
--- /dev/null
+++ b/app/src/main/res/layout/item_alarm_rv_l.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="90dp"
+    android:orientation="horizontal"
+    android:padding="5dp">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/alarmStatusView"
+            style="@style/TagStyle"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="正在报警"
+            app:qmui_backgroundColor="@color/redTextColor" />
+
+        <TextView
+            android:id="@+id/alarmContentView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="5dp"
+            android:layout_toEndOf="@id/alarmStatusView"
+            android:text="甲烷浓度超限"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginHorizontal="5dp"
+            android:text="1000"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/workRoadView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toStartOf="@id/alarmTimeView"
+            android:drawablePadding="@dimen/dp_5"
+            android:singleLine="true"
+            android:text="永定路"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12"
+            app:drawableStartCompat="@drawable/ic_alarm_location" />
+
+        <TextView
+            android:id="@+id/alarmTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="5dp"
+            android:text="2小时前"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
+
+    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+        android:id="@+id/alarmImageView"
+        android:layout_width="100dp"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/load_image_error"
+        app:qmui_border_width="0dp"
+        app:qmui_corner_radius="5dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 75bb067..3f2bc77 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,7 +4,7 @@
     <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
-    <color name="hintTextColor">#CCCCCC</color>
+    <color name="hintTextColor">#C0C0C0</color>
     <color name="itemSelectedColor">#DDDDDD</color>
     <color name="redTextColor">#FF0000</color>
     <color name="orangeTextColor">#FF6600</color>

diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
index 9f7962e..551b934 100644
--- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt
@@ -12,6 +12,7 @@
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
@@ -70,4 +71,15 @@
     val p = Pattern.compile(regEx)
     val m = p.matcher(this)
     return m.replaceAll("").trim { it <= ' ' }
+}
+
+fun String.formatToDate(): String {
+    if (this.isBlank()) {
+        return this
+    }
+    val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val date = simpleDateFormat.parse(this)
+
+    val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA)
+    return dateFormat.format(date)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
index 97c7284..064a17f 100644
--- a/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/model/AlarmListModel.java
@@ -5,7 +5,7 @@
 public class AlarmListModel {
 
     private int code;
-    private DataBean data;
+    private DataModel data;
     private String message;
     private boolean success;
 
@@ -17,11 +17,11 @@
         this.code = code;
     }
 
-    public DataBean getData() {
+    public DataModel getData() {
         return data;
     }
 
-    public void setData(DataBean data) {
+    public void setData(DataModel data) {
         this.data = data;
     }
 
@@ -41,15 +41,15 @@
         this.success = success;
     }
 
-    public static class DataBean {
-        private List<RowsBean> rows;
+    public static class DataModel {
+        private List<RowsModel> rows;
         private int total;
 
-        public List<RowsBean> getRows() {
+        public List<RowsModel> getRows() {
             return rows;
         }
 
-        public void setRows(List<RowsBean> rows) {
+        public void setRows(List<RowsModel> rows) {
             this.rows = rows;
         }
 
@@ -61,24 +61,42 @@
             this.total = total;
         }
 
-        public static class RowsBean {
-            private String alarmDescription;
+        public static class RowsModel {
+            private String alarmContent;
+            private String alarmImage;
             private String alarmLat;
             private String alarmLng;
-            private String area;
-            private String createTime;
+            private String alarmStatus;
+            private String alarmStatusName;
+            private String alarmTime;
+            private String alarmType;
+            private String alarmTypeName;
+            private String alarmValue;
+            private String cancelTime;
+            private String deviceId;
             private String id;
-            private String illegalAvatar;
-            private String location;
-            private String projectName;
-            private String projectType;
+            private String projectId;
+            private String projectState;
+            private String projectStateName;
+            private String workPersonName;
+            private String workPersonPhoneNumber;
+            private String workRoad;
+            private String workTitle;
 
-            public String getAlarmDescription() {
-                return alarmDescription;
+            public String getAlarmContent() {
+                return alarmContent;
             }
 
-            public void setAlarmDescription(String alarmDescription) {
-                this.alarmDescription = alarmDescription;
+            public void setAlarmContent(String alarmContent) {
+                this.alarmContent = alarmContent;
+            }
+
+            public String getAlarmImage() {
+                return alarmImage;
+            }
+
+            public void setAlarmImage(String alarmImage) {
+                this.alarmImage = alarmImage;
             }
 
             public String getAlarmLat() {
@@ -97,20 +115,68 @@
                 this.alarmLng = alarmLng;
             }
 
-            public String getArea() {
-                return area;
+            public String getAlarmStatus() {
+                return alarmStatus;
             }
 
-            public void setArea(String area) {
-                this.area = area;
+            public void setAlarmStatus(String alarmStatus) {
+                this.alarmStatus = alarmStatus;
             }
 
-            public String getCreateTime() {
-                return createTime;
+            public String getAlarmStatusName() {
+                return alarmStatusName;
             }
 
-            public void setCreateTime(String createTime) {
-                this.createTime = createTime;
+            public void setAlarmStatusName(String alarmStatusName) {
+                this.alarmStatusName = alarmStatusName;
+            }
+
+            public String getAlarmTime() {
+                return alarmTime;
+            }
+
+            public void setAlarmTime(String alarmTime) {
+                this.alarmTime = alarmTime;
+            }
+
+            public String getAlarmType() {
+                return alarmType;
+            }
+
+            public void setAlarmType(String alarmType) {
+                this.alarmType = alarmType;
+            }
+
+            public String getAlarmTypeName() {
+                return alarmTypeName;
+            }
+
+            public void setAlarmTypeName(String alarmTypeName) {
+                this.alarmTypeName = alarmTypeName;
+            }
+
+            public String getAlarmValue() {
+                return alarmValue;
+            }
+
+            public void setAlarmValue(String alarmValue) {
+                this.alarmValue = alarmValue;
+            }
+
+            public String getCancelTime() {
+                return cancelTime;
+            }
+
+            public void setCancelTime(String cancelTime) {
+                this.cancelTime = cancelTime;
+            }
+
+            public String getDeviceId() {
+                return deviceId;
+            }
+
+            public void setDeviceId(String deviceId) {
+                this.deviceId = deviceId;
             }
 
             public String getId() {
@@ -121,36 +187,60 @@
                 this.id = id;
             }
 
-            public String getIllegalAvatar() {
-                return illegalAvatar;
+            public String getProjectId() {
+                return projectId;
             }
 
-            public void setIllegalAvatar(String illegalAvatar) {
-                this.illegalAvatar = illegalAvatar;
+            public void setProjectId(String projectId) {
+                this.projectId = projectId;
             }
 
-            public String getLocation() {
-                return location;
+            public String getProjectState() {
+                return projectState;
             }
 
-            public void setLocation(String location) {
-                this.location = location;
+            public void setProjectState(String projectState) {
+                this.projectState = projectState;
             }
 
-            public String getProjectName() {
-                return projectName;
+            public String getProjectStateName() {
+                return projectStateName;
             }
 
-            public void setProjectName(String projectName) {
-                this.projectName = projectName;
+            public void setProjectStateName(String projectStateName) {
+                this.projectStateName = projectStateName;
             }
 
-            public String getProjectType() {
-                return projectType;
+            public String getWorkPersonName() {
+                return workPersonName;
             }
 
-            public void setProjectType(String projectType) {
-                this.projectType = projectType;
+            public void setWorkPersonName(String workPersonName) {
+                this.workPersonName = workPersonName;
+            }
+
+            public String getWorkPersonPhoneNumber() {
+                return workPersonPhoneNumber;
+            }
+
+            public void setWorkPersonPhoneNumber(String workPersonPhoneNumber) {
+                this.workPersonPhoneNumber = workPersonPhoneNumber;
+            }
+
+            public String getWorkRoad() {
+                return workRoad;
+            }
+
+            public void setWorkRoad(String workRoad) {
+                this.workRoad = workRoad;
+            }
+
+            public String getWorkTitle() {
+                return workTitle;
+            }
+
+            public void setWorkTitle(String workTitle) {
+                this.workTitle = workTitle;
             }
         }
     }
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 d318c17..5399670 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
@@ -5,6 +5,8 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.operationsite.R
+import com.casic.br.operationsite.extensions.combineImagePath
+import com.casic.br.operationsite.extensions.formatToDate
 import com.casic.br.operationsite.extensions.initLayoutImmersionBar
 import com.casic.br.operationsite.extensions.showEmptyPage
 import com.casic.br.operationsite.model.AlarmListModel
@@ -14,7 +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.navigatePageTo
+import com.pengxh.kt.lite.extensions.diffCurrentTime
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -25,9 +27,9 @@
 class AlarmListActivity : KotlinBaseActivity() {
 
     private lateinit var weakReferenceHandler: WeakReferenceHandler
-    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>
+    private lateinit var alarmListAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
     private lateinit var alarmViewModel: AlarmViewModel
-    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var dataBeans: MutableList<AlarmListModel.DataModel.RowsModel> = ArrayList()
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
@@ -65,8 +67,8 @@
     }
 
     override fun onResume() {
-        obtainAlarmListByPage()
         super.onResume()
+        obtainAlarmListByPage()
     }
 
     override fun initEvent() {
@@ -84,27 +86,26 @@
 
         alarmViewModel.alarmModel.observe(this) {
             if (it.code == 200) {
-                val dataRows = it.data?.rows
+                val dataRows = it.data?.rows!!
                 when {
                     isRefresh -> {
-                        dataBeans.clear()
-                        dataBeans = dataRows!!
+                        alarmListAdapter.setRefreshData(dataRows)
                         alarmRefreshLayout.finishRefresh()
                         isRefresh = false
                     }
                     isLoadMore -> {
-                        if (dataRows?.size == 0) {
+                        if (dataRows.size == 0) {
                             "到底了，别拉了".show(this)
                         }
-                        dataBeans.addAll(dataRows!!)
+                        alarmListAdapter.setLoadMoreData(dataRows)
                         alarmRefreshLayout.finishLoadMore()
                         isLoadMore = false
                     }
                     else -> {
-                        dataBeans = dataRows!!
+                        dataBeans = dataRows
+                        weakReferenceHandler.sendEmptyMessage(2022071201)
                     }
                 }
-                weakReferenceHandler.sendEmptyMessage(2022071201)
             }
         }
     }
@@ -115,44 +116,51 @@
 
     private val callback = Handler.Callback {
         if (it.what == 2022071201) {
-            if (isRefresh || isLoadMore) {
-                alarmListAdapter.notifyDataSetChanged()
-            } else { //首次加载数据
-                if (dataBeans.size == 0) {
-                    emptyView!!.showEmptyPage {
-                        pageIndex = 1
-                        obtainAlarmListByPage()
-                    }
-                } else {
-                    emptyView!!.hide()
-                    alarmListAdapter = object :
-                        NormalRecyclerAdapter<AlarmListModel.DataBean.RowsBean>(
-                            R.layout.item_alarm_rv, dataBeans
-                        ) {
-                        override fun convertView(
-                            viewHolder: ViewHolder,
-                            position: Int,
-                            item: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            viewHolder.setText(R.id.groupNameView, item.projectName)
-                                .setText(R.id.projectAreaView, item.area)
-                                .setText(R.id.projectTypeView, item.projectType)
-                                .setText(R.id.projectLocationView, item.location)
-                        }
-                    }
-                    alarmRecyclerView.addItemDecoration(
-                        DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-                    )
-                    alarmRecyclerView.adapter = alarmListAdapter
-                    alarmListAdapter.setOnItemClickedListener(object :
-                        NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataBean.RowsBean> {
-                        override fun onItemClicked(
-                            position: Int, t: AlarmListModel.DataBean.RowsBean
-                        ) {
-                            navigatePageTo<AlarmDetailActivity>(t.id)
-                        }
-                    })
+            if (dataBeans.size == 0) {
+                emptyView.showEmptyPage {
+                    pageIndex = 1
+                    obtainAlarmListByPage()
                 }
+            } else {
+                emptyView.hide()
+                alarmListAdapter =
+                    object : NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>(
+                        R.layout.item_alarm_rv_l, dataBeans
+                    ) {
+                        override fun convertView(
+                            viewHolder: ViewHolder, position: Int,
+                            item: AlarmListModel.DataModel.RowsModel
+                        ) {
+                            val deltaT = item.alarmTime.diffCurrentTime()
+                            val diffTime = if (deltaT < 24) {
+                                "${deltaT}小时前"
+                            } else {
+                                item.alarmTime.formatToDate()
+                            }
+
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                                .setText(R.id.alarmContentView, item.alarmContent)
+                                .setText(R.id.workRoadView, item.workRoad)
+                                .setText(R.id.alarmTimeView, diffTime)
+                                .setText(R.id.alarmValueView, "报警值：${item.alarmValue}")
+                                .setImageResource(
+                                    R.id.alarmImageView, item.alarmImage.combineImagePath()
+                                )
+                        }
+                    }
+                alarmRecyclerView.addItemDecoration(
+                    DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+                )
+                alarmRecyclerView.adapter = alarmListAdapter
+                alarmListAdapter.setOnItemClickedListener(object :
+                    NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
+                    override fun onItemClicked(
+                        position: Int, t: AlarmListModel.DataModel.RowsModel
+                    ) {
+//                        navigatePageTo<AlarmDetailActivity>(t.id)
+                        "需求待完善".show(this@AlarmListActivity)
+                    }
+                })
             }
         }
         true
diff --git a/app/src/main/res/drawable/ic_alarm_location.xml b/app/src/main/res/drawable/ic_alarm_location.xml
index 3b1513c..3d487ef 100644
--- a/app/src/main/res/drawable/ic_alarm_location.xml
+++ b/app/src/main/res/drawable/ic_alarm_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48px"
-    android:height="48px"
+    android:width="40px"
+    android:height="40px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/subTextColor"
+        android:fillColor="@color/hintTextColor"
         android:pathData="M512,64C317.92,64 160,221.92 160,416c0,187.36 315.42,520.03 328.83,534.08C494.88,956.45 503.26,960 512,960c0.22,0 0.48,0 0.7,0 8.99,0 17.47,-4.19 23.39,-10.94l109.22,-125.12C790.43,646.18 864,508.93 864,416 864,221.92 706.08,64 512,64zM512,576c-88.38,0 -160,-71.62 -160,-160s71.62,-160 160,-160 160,71.62 160,160S600.38,576 512,576z" />
 </vector>
diff --git a/app/src/main/res/layout/item_alarm_rv.xml b/app/src/main/res/layout/item_alarm_rv.xml
deleted file mode 100644
index a1b9e65..0000000
--- a/app/src/main/res/layout/item_alarm_rv.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="@dimen/dp_10"
-    android:paddingVertical="@dimen/dp_5">
-
-    <TextView
-        android:id="@+id/groupNameView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="城投湖畔四季城一期中坝七号地块"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:orientation="horizontal">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectAreaView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="盘龙区"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/greenColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/projectTypeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="品茗"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="@color/orangeTextColor"
-            app:qmui_borderWidth="0dp"
-            app:qmui_radius="@dimen/dp_3" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/projectLocationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_5"
-        android:text="昆明市盘龙区盘江西路与中坝路"
-        android:textColor="@color/subTextColor"
-        app:drawableStartCompat="@drawable/ic_alarm_location" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml
new file mode 100644
index 0000000..ef11c7a
--- /dev/null
+++ b/app/src/main/res/layout/item_alarm_rv_l.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="90dp"
+    android:orientation="horizontal"
+    android:padding="5dp">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/alarmStatusView"
+            style="@style/TagStyle"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="正在报警"
+            app:qmui_backgroundColor="@color/redTextColor" />
+
+        <TextView
+            android:id="@+id/alarmContentView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="5dp"
+            android:layout_toEndOf="@id/alarmStatusView"
+            android:text="甲烷浓度超限"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginHorizontal="5dp"
+            android:text="1000"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/workRoadView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toStartOf="@id/alarmTimeView"
+            android:drawablePadding="@dimen/dp_5"
+            android:singleLine="true"
+            android:text="永定路"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12"
+            app:drawableStartCompat="@drawable/ic_alarm_location" />
+
+        <TextView
+            android:id="@+id/alarmTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="5dp"
+            android:text="2小时前"
+            android:textColor="@color/hintTextColor"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
+
+    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+        android:id="@+id/alarmImageView"
+        android:layout_width="100dp"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/load_image_error"
+        app:qmui_border_width="0dp"
+        app:qmui_corner_radius="5dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 75bb067..3f2bc77 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,7 +4,7 @@
     <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
-    <color name="hintTextColor">#CCCCCC</color>
+    <color name="hintTextColor">#C0C0C0</color>
     <color name="itemSelectedColor">#DDDDDD</color>
     <color name="redTextColor">#FF0000</color>
     <color name="orangeTextColor">#FF6600</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 92ba91d..ecdfe92 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -96,6 +96,22 @@
         <item name="android:background">@drawable/ic_right</item>
     </style>
 
+    <!-- Tag Style -->
+    <style name="TagStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingStart">@dimen/dp_10</item>
+        <item name="android:paddingEnd">@dimen/dp_10</item>
+        <item name="android:paddingTop">@dimen/dp_1</item>
+        <item name="android:paddingBottom">@dimen/dp_1</item>
+        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="qmui_borderWidth">0dp</item>
+        <item name="qmui_radiusTopRight">@dimen/dp_5</item>
+        <item name="qmui_radiusBottomRight">@dimen/dp_5</item>
+        <item name="qmui_radiusBottomLeft">@dimen/dp_5</item>
+    </style>
+
     <style name="ActivityInOutAnimation" parent="Base.Theme.NoActionBar">
         <!--进入-->
         <item name="android:activityOpenEnterAnimation">@anim/activity_in</item>