diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt
index e1e239d..64b3dc6 100644
--- a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt
@@ -99,11 +99,16 @@ class DeviceOverviewListAdapter(
             binding.ivDevicePhoto.setImageDrawable(drawable)
         }
 
-        binding.tvMc.text = itemBean.name
         if(!TextUtils.isEmpty(itemBean.areaFullName)){
-            binding.tvArea.text = itemBean.areaFullName
+            binding.tvMc.text = itemBean.areaFullName+" > "+itemBean.name
+        }else{
+            binding.tvMc.text = itemBean.name
         }
         binding.tvSbzt.text = itemBean.description
+        if(!TextUtils.isEmpty(itemBean.description)&&"正常"==itemBean.description){
+            binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff
+        }
+
         if(itemBean.online){
             binding.tvZxzt.text = "在线"
             binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff
@@ -111,8 +116,6 @@ class DeviceOverviewListAdapter(
             binding.tvZxzt.text = "离线"
             binding.tvZxzt.setTextColor(Color.parseColor("#ff0000"))
         }
-        binding.tvZtsysc.text = itemBean.continuedTime
-        binding.tvAzsj.text = itemBean.installTime
         binding.tvYczsc.text = itemBean.runningTime
         binding.tvSjgxsj.text = itemBean.warningTime
         binding.llCwcz.setOnClickListener {
diff --git a/app/src/main/res/layout/adapter_device_overview_list.xml b/app/src/main/res/layout/adapter_device_overview_list.xml
index 809769a..2b35be7 100644
--- a/app/src/main/res/layout/adapter_device_overview_list.xml
+++ b/app/src/main/res/layout/adapter_device_overview_list.xml
@@ -11,75 +11,99 @@
         android:id="@+id/ll_cwcz"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="visible"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="visible">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="6dp"
             android:layout_marginTop="10dp"
+            android:layout_marginEnd="6dp"
             android:layout_marginBottom="10dp"
             android:layout_weight="1"
             android:orientation="vertical"
             tools:ignore="UselessParent">
 
             <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_mc"
+                    style="@style/deviceManagerStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="#1锅炉区域 > 1号锅炉0米捞渣机,锅炉区域" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#cccccc" />
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                tools:ignore="UselessParent">
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
                 <LinearLayout
                     style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
+                    android:layout_marginTop="0dp"
                     android:orientation="horizontal">
 
+                    <ImageView
+                        android:id="@+id/iv_device_photo"
+                        android:layout_width="110dp"
+                        android:layout_height="110dp"
+                        android:contentDescription="@string/iv_device_photo"
+                        android:src="@drawable/icon_device_place" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:layout_margin="6dp"
+                    android:orientation="vertical">
                     <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="wrap_content"
+                        style="@style/deviceOverlayStyle"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="0dp"
                         android:orientation="horizontal">
-                        <ImageView
-                            android:id="@+id/iv_device_photo"
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:contentDescription="@string/iv_device_photo"
-                            android:src="@drawable/icon_device_place"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="0dp"
-                        android:layout_marginTop="3dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:orientation="vertical">
+
                         <LinearLayout
                             style="@style/dagerListMarginTopStyle"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:layout_marginBottom="5dp"
                             android:orientation="horizontal">
 
                             <TextView
                                 style="@style/deviceManagerStyle"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="设备位置:" />
+                                android:text="设备状态:" />
 
                             <TextView
-                                android:id="@+id/tv_area"
+                                android:id="@+id/tv_sbzt"
                                 style="@style/deviceManagerStyle"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="#1锅炉区域 > 1号锅炉0米捞渣机,锅炉区域" />
+                                android:layout_weight="1" />
                         </LinearLayout>
+
                         <LinearLayout
                             style="@style/dagerListMarginTopStyle"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:orientation="horizontal">
@@ -88,153 +112,72 @@
                                 style="@style/deviceManagerStyle"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="设备名称:" />
+                                android:text="在线状态:" />
 
                             <TextView
-                                android:id="@+id/tv_mc"
+                                android:id="@+id/tv_zxzt"
                                 style="@style/deviceManagerStyle"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="#1-2循环浆液泵电机尾部" />
+                                android:layout_weight="1" />
                         </LinearLayout>
                     </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
                     <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="0dp"
+                        style="@style/deviceOverlayStyle"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:orientation="horizontal">
 
-                        <TextView
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="设备状态:" />
-
-                        <TextView
-                            android:id="@+id/tv_sbzt"
-                            style="@style/deviceManagerStyle"
+                        <LinearLayout
+                            style="@style/dagerListMarginTopStyle"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1" />
-                    </LinearLayout>
-                    <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="horizontal">
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="在线状态:" />
+                            <TextView
+                                style="@style/deviceManagerStyle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="运行总时长:" />
 
-                        <TextView
-                            android:id="@+id/tv_zxzt"
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1" />
+                            <TextView
+                                android:id="@+id/tv_yczsc"
+                                style="@style/deviceManagerStyle"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1" />
+                        </LinearLayout>
                     </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
                     <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="0dp"
+                        style="@style/deviceOverlayStyle"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_marginBottom="6dp"
                         android:orientation="horizontal">
 
-                        <TextView
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="状态持续时长:" />
-
-                        <TextView
-                            android:id="@+id/tv_ztsysc"
-                            style="@style/deviceManagerStyle"
+                        <LinearLayout
+                            style="@style/dagerListMarginTopStyle"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1" />
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/deviceManagerStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:text="安装时间:" />
-
-                    <TextView
-                        android:id="@+id/tv_azsj"
-                        style="@style/deviceManagerStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-                </LinearLayout>
-                <LinearLayout
-                    style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        style="@style/dagerListMarginTopStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="horizontal">
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="运行总时长:" />
+                            <TextView
+                                style="@style/deviceManagerStyle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="数据更新时间:" />
 
-                        <TextView
-                            android:id="@+id/tv_yczsc"
-                            style="@style/deviceManagerStyle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1" />
+                            <TextView
+                                android:id="@+id/tv_sjgxsj"
+                                style="@style/deviceManagerStyle"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1" />
+                        </LinearLayout>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout
-                    style="@style/dagerListMarginTopStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/deviceManagerStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:text="数据更新时间:" />
-
-                    <TextView
-                        android:id="@+id/tv_sjgxsj"
-                        style="@style/deviceManagerStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a795c07..c1e53bd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -140,6 +140,10 @@
     <style name="dagerListMarginTopStyle">
         <item name="android:layout_marginTop">5dp</item>
     </style>
+    <!-- 设备总览样式-->
+    <style name="deviceOverlayStyle">
+        <item name="android:layout_marginTop">8dp</item>
+    </style>
     <!-- 危化品入厂申请列表左边样式-->
     <style name="dagerListLeftStyle">
         <item name="android:gravity">center</item>