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 4e5dfcc..d8bd618 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
@@ -17,6 +17,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
 import com.pengxh.kt.lite.extensions.convertColor
+import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
@@ -28,6 +29,7 @@
 class AlarmListActivity : KotlinBaseActivity<ActivityAlarmListBinding>() {
 
     private val context = this
+    private val marginOffset by lazy { 7.dp2px(this) }
     private val systemViewModel by lazy { ViewModelProvider(this)[SystemViewModel::class.java] }
     private val alarmViewModel by lazy { ViewModelProvider(this)[AlarmViewModel::class.java] }
     private lateinit var alarmAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
@@ -60,6 +62,7 @@
                         override fun onConfirmClick(type: String) {
                             this@AlarmListActivity.type = type
                             this@AlarmListActivity.page = 1
+                            this@AlarmListActivity.isRefresh = true
                             getAlarmListByPage()
                         }
 
@@ -123,33 +126,33 @@
             onSuccess = {
                 LoadingDialog.dismiss()
                 if (it.code == 200) {
-                    val dataRows = it.data?.rows!!
-                    when {
-                        isRefresh -> {
-                            binding.refreshView.finishRefresh()
-                            isRefresh = false
-                            alarmAdapter.refresh(dataRows)
-                        }
-
-                        isLoadMore -> {
-                            binding.refreshView.finishLoadMore()
-                            isLoadMore = false
-                            if (dataRows.isEmpty()) {
-                                "到底了，别拉了".show(this)
-                                return@getAlarmListByPage
+                    it.data?.let {
+                        val dataRows = it.rows
+                        when {
+                            isRefresh -> {
+                                binding.refreshView.finishRefresh()
+                                isRefresh = false
+                                alarmAdapter.refresh(dataRows)
                             }
-                            alarmAdapter.loadMore(dataRows)
-                        }
 
-                        else -> {
-                            if (dataRows.isEmpty()) {
-                                binding.emptyView.visibility = View.VISIBLE
-                                binding.recyclerView.visibility = View.GONE
-                            } else {
-                                binding.emptyView.visibility = View.GONE
-                                binding.recyclerView.visibility = View.VISIBLE
-                                initRecyclerView(dataRows)
+                            isLoadMore -> {
+                                binding.refreshView.finishLoadMore()
+                                isLoadMore = false
+                                if (dataRows.isEmpty()) {
+                                    "到底了，别拉了".show(this)
+                                    return@getAlarmListByPage
+                                }
+                                alarmAdapter.loadMore(dataRows)
                             }
+
+                            else -> initRecyclerView(dataRows)
+                        }
+                        if (dataRows.isEmpty()) {
+                            binding.emptyView.visibility = View.VISIBLE
+                            binding.recyclerView.visibility = View.GONE
+                        } else {
+                            binding.emptyView.visibility = View.GONE
+                            binding.recyclerView.visibility = View.VISIBLE
                         }
                     }
                 }
@@ -213,7 +216,11 @@
             }
         }
         binding.recyclerView.adapter = alarmAdapter
-        binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1))
+        binding.recyclerView.addItemDecoration(
+            RecyclerViewItemOffsets(
+                marginOffset, marginOffset shr 1, marginOffset, marginOffset shr 1
+            )
+        )
         alarmAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
             override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) {

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 4e5dfcc..d8bd618 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
@@ -17,6 +17,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
 import com.pengxh.kt.lite.extensions.convertColor
+import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
@@ -28,6 +29,7 @@
 class AlarmListActivity : KotlinBaseActivity<ActivityAlarmListBinding>() {
 
     private val context = this
+    private val marginOffset by lazy { 7.dp2px(this) }
     private val systemViewModel by lazy { ViewModelProvider(this)[SystemViewModel::class.java] }
     private val alarmViewModel by lazy { ViewModelProvider(this)[AlarmViewModel::class.java] }
     private lateinit var alarmAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
@@ -60,6 +62,7 @@
                         override fun onConfirmClick(type: String) {
                             this@AlarmListActivity.type = type
                             this@AlarmListActivity.page = 1
+                            this@AlarmListActivity.isRefresh = true
                             getAlarmListByPage()
                         }
 
@@ -123,33 +126,33 @@
             onSuccess = {
                 LoadingDialog.dismiss()
                 if (it.code == 200) {
-                    val dataRows = it.data?.rows!!
-                    when {
-                        isRefresh -> {
-                            binding.refreshView.finishRefresh()
-                            isRefresh = false
-                            alarmAdapter.refresh(dataRows)
-                        }
-
-                        isLoadMore -> {
-                            binding.refreshView.finishLoadMore()
-                            isLoadMore = false
-                            if (dataRows.isEmpty()) {
-                                "到底了，别拉了".show(this)
-                                return@getAlarmListByPage
+                    it.data?.let {
+                        val dataRows = it.rows
+                        when {
+                            isRefresh -> {
+                                binding.refreshView.finishRefresh()
+                                isRefresh = false
+                                alarmAdapter.refresh(dataRows)
                             }
-                            alarmAdapter.loadMore(dataRows)
-                        }
 
-                        else -> {
-                            if (dataRows.isEmpty()) {
-                                binding.emptyView.visibility = View.VISIBLE
-                                binding.recyclerView.visibility = View.GONE
-                            } else {
-                                binding.emptyView.visibility = View.GONE
-                                binding.recyclerView.visibility = View.VISIBLE
-                                initRecyclerView(dataRows)
+                            isLoadMore -> {
+                                binding.refreshView.finishLoadMore()
+                                isLoadMore = false
+                                if (dataRows.isEmpty()) {
+                                    "到底了，别拉了".show(this)
+                                    return@getAlarmListByPage
+                                }
+                                alarmAdapter.loadMore(dataRows)
                             }
+
+                            else -> initRecyclerView(dataRows)
+                        }
+                        if (dataRows.isEmpty()) {
+                            binding.emptyView.visibility = View.VISIBLE
+                            binding.recyclerView.visibility = View.GONE
+                        } else {
+                            binding.emptyView.visibility = View.GONE
+                            binding.recyclerView.visibility = View.VISIBLE
                         }
                     }
                 }
@@ -213,7 +216,11 @@
             }
         }
         binding.recyclerView.adapter = alarmAdapter
-        binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1))
+        binding.recyclerView.addItemDecoration(
+            RecyclerViewItemOffsets(
+                marginOffset, marginOffset shr 1, marginOffset, marginOffset shr 1
+            )
+        )
         alarmAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
             override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) {
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index d1bf9c8..8b9eb52 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <com.scwang.smartrefresh.layout.footer.ClassicsFooter

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 4e5dfcc..d8bd618 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
@@ -17,6 +17,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
 import com.pengxh.kt.lite.extensions.convertColor
+import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
@@ -28,6 +29,7 @@
 class AlarmListActivity : KotlinBaseActivity<ActivityAlarmListBinding>() {
 
     private val context = this
+    private val marginOffset by lazy { 7.dp2px(this) }
     private val systemViewModel by lazy { ViewModelProvider(this)[SystemViewModel::class.java] }
     private val alarmViewModel by lazy { ViewModelProvider(this)[AlarmViewModel::class.java] }
     private lateinit var alarmAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
@@ -60,6 +62,7 @@
                         override fun onConfirmClick(type: String) {
                             this@AlarmListActivity.type = type
                             this@AlarmListActivity.page = 1
+                            this@AlarmListActivity.isRefresh = true
                             getAlarmListByPage()
                         }
 
@@ -123,33 +126,33 @@
             onSuccess = {
                 LoadingDialog.dismiss()
                 if (it.code == 200) {
-                    val dataRows = it.data?.rows!!
-                    when {
-                        isRefresh -> {
-                            binding.refreshView.finishRefresh()
-                            isRefresh = false
-                            alarmAdapter.refresh(dataRows)
-                        }
-
-                        isLoadMore -> {
-                            binding.refreshView.finishLoadMore()
-                            isLoadMore = false
-                            if (dataRows.isEmpty()) {
-                                "到底了，别拉了".show(this)
-                                return@getAlarmListByPage
+                    it.data?.let {
+                        val dataRows = it.rows
+                        when {
+                            isRefresh -> {
+                                binding.refreshView.finishRefresh()
+                                isRefresh = false
+                                alarmAdapter.refresh(dataRows)
                             }
-                            alarmAdapter.loadMore(dataRows)
-                        }
 
-                        else -> {
-                            if (dataRows.isEmpty()) {
-                                binding.emptyView.visibility = View.VISIBLE
-                                binding.recyclerView.visibility = View.GONE
-                            } else {
-                                binding.emptyView.visibility = View.GONE
-                                binding.recyclerView.visibility = View.VISIBLE
-                                initRecyclerView(dataRows)
+                            isLoadMore -> {
+                                binding.refreshView.finishLoadMore()
+                                isLoadMore = false
+                                if (dataRows.isEmpty()) {
+                                    "到底了，别拉了".show(this)
+                                    return@getAlarmListByPage
+                                }
+                                alarmAdapter.loadMore(dataRows)
                             }
+
+                            else -> initRecyclerView(dataRows)
+                        }
+                        if (dataRows.isEmpty()) {
+                            binding.emptyView.visibility = View.VISIBLE
+                            binding.recyclerView.visibility = View.GONE
+                        } else {
+                            binding.emptyView.visibility = View.GONE
+                            binding.recyclerView.visibility = View.VISIBLE
                         }
                     }
                 }
@@ -213,7 +216,11 @@
             }
         }
         binding.recyclerView.adapter = alarmAdapter
-        binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1))
+        binding.recyclerView.addItemDecoration(
+            RecyclerViewItemOffsets(
+                marginOffset, marginOffset shr 1, marginOffset, marginOffset shr 1
+            )
+        )
         alarmAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
             override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) {
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index d1bf9c8..8b9eb52 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <com.scwang.smartrefresh.layout.footer.ClassicsFooter
diff --git a/app/src/main/res/layout/activity_gas_detail.xml b/app/src/main/res/layout/activity_gas_detail.xml
index 52badb6..295cf30 100644
--- a/app/src/main/res/layout/activity_gas_detail.xml
+++ b/app/src/main/res/layout/activity_gas_detail.xml
@@ -27,29 +27,41 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
                 app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                app:cardElevation="@dimen/dp_5">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
+                    <!-- 标题栏 -->
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="设备基本信息"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
 
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
+
+                    <!-- 内容区域 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:padding="15dp">
 
+                        <!-- 左侧文本信息 -->
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -68,7 +80,7 @@
                                 android:id="@+id/deviceNameView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginVertical="@dimen/dp_5"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="产品名称：便携式燃气监测设备"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
@@ -77,6 +89,7 @@
                                 android:id="@+id/deviceModelView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="产品型号：BIRMM-GT400N"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
@@ -85,7 +98,8 @@
                                 android:id="@+id/belongView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginVertical="@dimen/dp_5"
+                                android:layout_marginTop="@dimen/dp_5"
+                                android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="所属项目：XXX"
                                 android:textColor="@color/mainTextColor"
@@ -95,16 +109,18 @@
                                 android:id="@+id/projectLeaderView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="项目负责人：XXXX"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
                         </LinearLayout>
 
+                        <!-- 右侧图标或图片 -->
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginHorizontal="@dimen/dp_10"
+                            android:contentDescription="设备图标"
                             android:src="@mipmap/ic_launcher" />
                     </LinearLayout>
                 </LinearLayout>
@@ -113,8 +129,8 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                android:layout_marginHorizontal="@dimen/dp_10"
+                app:cardCornerRadius="@dimen/dp_10">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -124,25 +140,34 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="实时监测浓度"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
+
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
 
                     <com.github.mikephil.charting.charts.LineChart
                         android:id="@+id/lineChart"
                         android:layout_width="match_parent"
                         android:layout_height="256dp"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10" />
+                        android:layout_margin="15dp" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
                 app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                app:cardElevation="@dimen/dp_5">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -152,17 +177,25 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="设备位置"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
+
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
 
                     <com.casic.br.operationsite.widgets.CustomMapView
                         android:id="@+id/mapView"
                         android:layout_width="match_parent"
                         android:layout_height="256dp"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10" />
+                        android:layout_margin="15dp" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>

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 4e5dfcc..d8bd618 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
@@ -17,6 +17,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
 import com.pengxh.kt.lite.extensions.convertColor
+import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
@@ -28,6 +29,7 @@
 class AlarmListActivity : KotlinBaseActivity<ActivityAlarmListBinding>() {
 
     private val context = this
+    private val marginOffset by lazy { 7.dp2px(this) }
     private val systemViewModel by lazy { ViewModelProvider(this)[SystemViewModel::class.java] }
     private val alarmViewModel by lazy { ViewModelProvider(this)[AlarmViewModel::class.java] }
     private lateinit var alarmAdapter: NormalRecyclerAdapter<AlarmListModel.DataModel.RowsModel>
@@ -60,6 +62,7 @@
                         override fun onConfirmClick(type: String) {
                             this@AlarmListActivity.type = type
                             this@AlarmListActivity.page = 1
+                            this@AlarmListActivity.isRefresh = true
                             getAlarmListByPage()
                         }
 
@@ -123,33 +126,33 @@
             onSuccess = {
                 LoadingDialog.dismiss()
                 if (it.code == 200) {
-                    val dataRows = it.data?.rows!!
-                    when {
-                        isRefresh -> {
-                            binding.refreshView.finishRefresh()
-                            isRefresh = false
-                            alarmAdapter.refresh(dataRows)
-                        }
-
-                        isLoadMore -> {
-                            binding.refreshView.finishLoadMore()
-                            isLoadMore = false
-                            if (dataRows.isEmpty()) {
-                                "到底了，别拉了".show(this)
-                                return@getAlarmListByPage
+                    it.data?.let {
+                        val dataRows = it.rows
+                        when {
+                            isRefresh -> {
+                                binding.refreshView.finishRefresh()
+                                isRefresh = false
+                                alarmAdapter.refresh(dataRows)
                             }
-                            alarmAdapter.loadMore(dataRows)
-                        }
 
-                        else -> {
-                            if (dataRows.isEmpty()) {
-                                binding.emptyView.visibility = View.VISIBLE
-                                binding.recyclerView.visibility = View.GONE
-                            } else {
-                                binding.emptyView.visibility = View.GONE
-                                binding.recyclerView.visibility = View.VISIBLE
-                                initRecyclerView(dataRows)
+                            isLoadMore -> {
+                                binding.refreshView.finishLoadMore()
+                                isLoadMore = false
+                                if (dataRows.isEmpty()) {
+                                    "到底了，别拉了".show(this)
+                                    return@getAlarmListByPage
+                                }
+                                alarmAdapter.loadMore(dataRows)
                             }
+
+                            else -> initRecyclerView(dataRows)
+                        }
+                        if (dataRows.isEmpty()) {
+                            binding.emptyView.visibility = View.VISIBLE
+                            binding.recyclerView.visibility = View.GONE
+                        } else {
+                            binding.emptyView.visibility = View.GONE
+                            binding.recyclerView.visibility = View.VISIBLE
                         }
                     }
                 }
@@ -213,7 +216,11 @@
             }
         }
         binding.recyclerView.adapter = alarmAdapter
-        binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1))
+        binding.recyclerView.addItemDecoration(
+            RecyclerViewItemOffsets(
+                marginOffset, marginOffset shr 1, marginOffset, marginOffset shr 1
+            )
+        )
         alarmAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<AlarmListModel.DataModel.RowsModel> {
             override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) {
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index d1bf9c8..8b9eb52 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <com.scwang.smartrefresh.layout.footer.ClassicsFooter
diff --git a/app/src/main/res/layout/activity_gas_detail.xml b/app/src/main/res/layout/activity_gas_detail.xml
index 52badb6..295cf30 100644
--- a/app/src/main/res/layout/activity_gas_detail.xml
+++ b/app/src/main/res/layout/activity_gas_detail.xml
@@ -27,29 +27,41 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
                 app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                app:cardElevation="@dimen/dp_5">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
+                    <!-- 标题栏 -->
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="设备基本信息"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
 
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
+
+                    <!-- 内容区域 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:padding="15dp">
 
+                        <!-- 左侧文本信息 -->
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -68,7 +80,7 @@
                                 android:id="@+id/deviceNameView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginVertical="@dimen/dp_5"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="产品名称：便携式燃气监测设备"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
@@ -77,6 +89,7 @@
                                 android:id="@+id/deviceModelView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="产品型号：BIRMM-GT400N"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
@@ -85,7 +98,8 @@
                                 android:id="@+id/belongView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginVertical="@dimen/dp_5"
+                                android:layout_marginTop="@dimen/dp_5"
+                                android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="所属项目：XXX"
                                 android:textColor="@color/mainTextColor"
@@ -95,16 +109,18 @@
                                 android:id="@+id/projectLeaderView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="项目负责人：XXXX"
                                 android:textColor="@color/mainTextColor"
                                 android:textSize="@dimen/sp_14" />
                         </LinearLayout>
 
+                        <!-- 右侧图标或图片 -->
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginHorizontal="@dimen/dp_10"
+                            android:contentDescription="设备图标"
                             android:src="@mipmap/ic_launcher" />
                     </LinearLayout>
                 </LinearLayout>
@@ -113,8 +129,8 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                android:layout_marginHorizontal="@dimen/dp_10"
+                app:cardCornerRadius="@dimen/dp_10">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -124,25 +140,34 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="实时监测浓度"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
+
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
 
                     <com.github.mikephil.charting.charts.LineChart
                         android:id="@+id/lineChart"
                         android:layout_width="match_parent"
                         android:layout_height="256dp"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10" />
+                        android:layout_margin="15dp" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
                 app:cardCornerRadius="@dimen/dp_10"
-                app:cardUseCompatPadding="true">
+                app:cardElevation="@dimen/dp_5">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -152,17 +177,25 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:text="设备位置"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
+
+                    <!-- 分割线 -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/lineViewSize"
+                        android:layout_marginTop="@dimen/dp_7"
+                        android:background="@color/hintTextColor" />
 
                     <com.casic.br.operationsite.widgets.CustomMapView
                         android:id="@+id/mapView"
                         android:layout_width="match_parent"
                         android:layout_height="256dp"
-                        android:layout_marginHorizontal="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10" />
+                        android:layout_margin="15dp" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_alarm_rv_l.xml b/app/src/main/res/layout/item_alarm_rv_l.xml
index 1d657c2..c90a9b5 100644
--- a/app/src/main/res/layout/item_alarm_rv_l.xml
+++ b/app/src/main/res/layout/item_alarm_rv_l.xml
@@ -1,72 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView 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="100dp"
-    android:background="@color/white"
-    android:orientation="horizontal"
-    android:padding="5dp">
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="@dimen/dp_10"
+    app:cardElevation="@dimen/dp_5">
 
-    <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
 
-        <TextView
-            android:id="@+id/alarmStatusView"
-            style="@style/TagStyle"
-            android:background="@color/redTextColor"
-            android:paddingHorizontal="@dimen/dp_5"
-            android:text="正在报警" />
+        <!-- 左侧文本区域 -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="@dimen/dp_7"
+            android:layout_weight="1"
+            android:orientation="vertical">
 
-        <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" />
+            <!-- 状态标签 & 报警内容 -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <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" />
+                <TextView
+                    android:id="@+id/alarmStatusView"
+                    style="@style/TagStyle"
+                    android:background="@color/redTextColor"
+                    android:paddingHorizontal="@dimen/dp_5"
+                    android:text="正在报警"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_12" />
 
-        <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/alarmContentView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_7"
+                    android:text="甲烷浓度超限"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/sp_16" />
+            </LinearLayout>
 
-        <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>
+            <!-- 数值 -->
+            <TextView
+                android:id="@+id/alarmValueView"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="@dimen/dp_5"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="1000"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:textStyle="bold" />
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/alarmImageView"
-        android:layout_width="120dp"
-        android:layout_height="match_parent"
-        android:background="#F1F1F1"
-        android:scaleType="centerCrop"
-        app:shapeAppearance="@style/RoundedStyle" />
-</LinearLayout>
\ No newline at end of file
+            <!-- 分割线 -->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/lineViewSize"
+                android:layout_marginVertical="@dimen/dp_7"
+                android:background="@color/hintTextColor" />
+
+            <!-- 地点 & 时间 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="bottom"
+                android:orientation="horizontal"
+                android:weightSum="2.5">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/dp_3"
+                        android:src="@drawable/ic_alarm_location" />
+
+                    <TextView
+                        android:id="@+id/workRoadView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        android:text="永定路"
+                        android:textColor="@color/hintTextColor"
+                        android:textSize="@dimen/sp_12" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/alarmTimeView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.5"
+                    android:gravity="end"
+                    android:singleLine="true"
+                    android:text="2小时前"
+                    android:textColor="@color/hintTextColor"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- 右侧图片 -->
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/alarmImageView"
+            android:layout_width="120dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center_vertical"
+            android:scaleType="centerCrop"
+            app:shapeAppearance="@style/RoundedStyle" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file