diff --git a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
index aa30006..0598a38 100644
--- a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
@@ -24,6 +24,7 @@
 
     private val kTag = "StatusPageFragment"
     private var isDeviceWorking = false
+    private var isDelayed = false
     private val wifi by lazy { requireContext().applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager }
     private val paramObject by lazy { org.json.JSONObject() }//数据Json对象
     private val dataTimer by lazy { Timer() }//数据上传Timer
@@ -91,6 +92,9 @@
                             }
                             paramObject.put("switchStatus", switchStatus)
                         }
+                        "2" -> {
+                            isDelayed = parseObject[it] as Boolean
+                        }
                         "11" -> {//设备状态，[off, low, high, strong, air, fangdaoguan, wash, delay, xunhang]
                             deviceStateView.text = when (parseObject[it] as String) {
                                 "low" -> "低档"
@@ -113,6 +117,17 @@
                             }
                             paramObject.put("runTime", workingTimeView.text)
                         }
+                        "105" -> {
+                            if (isDeviceWorking) {
+                                delayTimeView.text = if (isDelayed) {
+                                    String.format("${parseObject[it].toString()}s")
+                                } else {
+                                    "0s"
+                                }
+                            } else {
+                                delayTimeView.text = "未开启"
+                            }
+                        }
                         "106" -> {//烟灶联动
                             if (parseObject[it] as Boolean) {
                                 linkageView.text = "开"

diff --git a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
index aa30006..0598a38 100644
--- a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
@@ -24,6 +24,7 @@
 
     private val kTag = "StatusPageFragment"
     private var isDeviceWorking = false
+    private var isDelayed = false
     private val wifi by lazy { requireContext().applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager }
     private val paramObject by lazy { org.json.JSONObject() }//数据Json对象
     private val dataTimer by lazy { Timer() }//数据上传Timer
@@ -91,6 +92,9 @@
                             }
                             paramObject.put("switchStatus", switchStatus)
                         }
+                        "2" -> {
+                            isDelayed = parseObject[it] as Boolean
+                        }
                         "11" -> {//设备状态，[off, low, high, strong, air, fangdaoguan, wash, delay, xunhang]
                             deviceStateView.text = when (parseObject[it] as String) {
                                 "low" -> "低档"
@@ -113,6 +117,17 @@
                             }
                             paramObject.put("runTime", workingTimeView.text)
                         }
+                        "105" -> {
+                            if (isDeviceWorking) {
+                                delayTimeView.text = if (isDelayed) {
+                                    String.format("${parseObject[it].toString()}s")
+                                } else {
+                                    "0s"
+                                }
+                            } else {
+                                delayTimeView.text = "未开启"
+                            }
+                        }
                         "106" -> {//烟灶联动
                             if (parseObject[it] as Boolean) {
                                 linkageView.text = "开"
diff --git a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
index c02c881..3c3f0fe 100644
--- a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
@@ -6,7 +6,6 @@
 import android.view.LayoutInflater
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.alibaba.fastjson.JSONObject
 import com.bumptech.glide.Glide
 import com.casic.br.R
 import com.casic.br.adapter.TabPagerAdapter
@@ -47,8 +46,6 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
     private lateinit var tuyaOTA: ITuyaOta
     private lateinit var deviceInstance: ITuyaDevice
-    private var isWorking = false
-    private var isDelayed = false
 
     override fun initLayoutView(): Int = R.layout.activity_range_hood
 
@@ -88,28 +85,6 @@
 
             override fun onDpUpdate(devId: String?, dpStr: String?) {
                 Log.d(kTag, "onDpUpdate: $dpStr")
-                val parseObject = JSONObject.parseObject(dpStr)
-                parseObject.keys.forEach {
-                    when (it) {
-                        "1" -> {
-                            isWorking = parseObject[it] as Boolean
-                        }
-                        "2" -> {
-                            isDelayed = parseObject[it] as Boolean
-                        }
-                        "105" -> {
-                            if (isWorking) {
-                                delayTimeView.text = if (isDelayed) {
-                                    String.format("${parseObject[it].toString()}s")
-                                } else {
-                                    "0s"
-                                }
-                            } else {
-                                delayTimeView.text = "未开启"
-                            }
-                        }
-                    }
-                }
 
                 val controlMsg = ControlPageFragment.weakReference.obtainMessage()
                 controlMsg.what = 2022092301

diff --git a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
index aa30006..0598a38 100644
--- a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
@@ -24,6 +24,7 @@
 
     private val kTag = "StatusPageFragment"
     private var isDeviceWorking = false
+    private var isDelayed = false
     private val wifi by lazy { requireContext().applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager }
     private val paramObject by lazy { org.json.JSONObject() }//数据Json对象
     private val dataTimer by lazy { Timer() }//数据上传Timer
@@ -91,6 +92,9 @@
                             }
                             paramObject.put("switchStatus", switchStatus)
                         }
+                        "2" -> {
+                            isDelayed = parseObject[it] as Boolean
+                        }
                         "11" -> {//设备状态，[off, low, high, strong, air, fangdaoguan, wash, delay, xunhang]
                             deviceStateView.text = when (parseObject[it] as String) {
                                 "low" -> "低档"
@@ -113,6 +117,17 @@
                             }
                             paramObject.put("runTime", workingTimeView.text)
                         }
+                        "105" -> {
+                            if (isDeviceWorking) {
+                                delayTimeView.text = if (isDelayed) {
+                                    String.format("${parseObject[it].toString()}s")
+                                } else {
+                                    "0s"
+                                }
+                            } else {
+                                delayTimeView.text = "未开启"
+                            }
+                        }
                         "106" -> {//烟灶联动
                             if (parseObject[it] as Boolean) {
                                 linkageView.text = "开"
diff --git a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
index c02c881..3c3f0fe 100644
--- a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
@@ -6,7 +6,6 @@
 import android.view.LayoutInflater
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.alibaba.fastjson.JSONObject
 import com.bumptech.glide.Glide
 import com.casic.br.R
 import com.casic.br.adapter.TabPagerAdapter
@@ -47,8 +46,6 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
     private lateinit var tuyaOTA: ITuyaOta
     private lateinit var deviceInstance: ITuyaDevice
-    private var isWorking = false
-    private var isDelayed = false
 
     override fun initLayoutView(): Int = R.layout.activity_range_hood
 
@@ -88,28 +85,6 @@
 
             override fun onDpUpdate(devId: String?, dpStr: String?) {
                 Log.d(kTag, "onDpUpdate: $dpStr")
-                val parseObject = JSONObject.parseObject(dpStr)
-                parseObject.keys.forEach {
-                    when (it) {
-                        "1" -> {
-                            isWorking = parseObject[it] as Boolean
-                        }
-                        "2" -> {
-                            isDelayed = parseObject[it] as Boolean
-                        }
-                        "105" -> {
-                            if (isWorking) {
-                                delayTimeView.text = if (isDelayed) {
-                                    String.format("${parseObject[it].toString()}s")
-                                } else {
-                                    "0s"
-                                }
-                            } else {
-                                delayTimeView.text = "未开启"
-                            }
-                        }
-                    }
-                }
 
                 val controlMsg = ControlPageFragment.weakReference.obtainMessage()
                 controlMsg.what = 2022092301
diff --git a/app/src/main/res/layout/activity_range_hood.xml b/app/src/main/res/layout/activity_range_hood.xml
index 7460bd1..c255b3c 100644
--- a/app/src/main/res/layout/activity_range_hood.xml
+++ b/app/src/main/res/layout/activity_range_hood.xml
@@ -20,18 +20,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="延时倒计时" />
-
-        <TextView
-            android:id="@+id/delayTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="@dimen/dp_5"
-            android:text="0秒" />
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/deviceTabLayout"
             android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
index aa30006..0598a38 100644
--- a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
@@ -24,6 +24,7 @@
 
     private val kTag = "StatusPageFragment"
     private var isDeviceWorking = false
+    private var isDelayed = false
     private val wifi by lazy { requireContext().applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager }
     private val paramObject by lazy { org.json.JSONObject() }//数据Json对象
     private val dataTimer by lazy { Timer() }//数据上传Timer
@@ -91,6 +92,9 @@
                             }
                             paramObject.put("switchStatus", switchStatus)
                         }
+                        "2" -> {
+                            isDelayed = parseObject[it] as Boolean
+                        }
                         "11" -> {//设备状态，[off, low, high, strong, air, fangdaoguan, wash, delay, xunhang]
                             deviceStateView.text = when (parseObject[it] as String) {
                                 "low" -> "低档"
@@ -113,6 +117,17 @@
                             }
                             paramObject.put("runTime", workingTimeView.text)
                         }
+                        "105" -> {
+                            if (isDeviceWorking) {
+                                delayTimeView.text = if (isDelayed) {
+                                    String.format("${parseObject[it].toString()}s")
+                                } else {
+                                    "0s"
+                                }
+                            } else {
+                                delayTimeView.text = "未开启"
+                            }
+                        }
                         "106" -> {//烟灶联动
                             if (parseObject[it] as Boolean) {
                                 linkageView.text = "开"
diff --git a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
index c02c881..3c3f0fe 100644
--- a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
@@ -6,7 +6,6 @@
 import android.view.LayoutInflater
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.alibaba.fastjson.JSONObject
 import com.bumptech.glide.Glide
 import com.casic.br.R
 import com.casic.br.adapter.TabPagerAdapter
@@ -47,8 +46,6 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
     private lateinit var tuyaOTA: ITuyaOta
     private lateinit var deviceInstance: ITuyaDevice
-    private var isWorking = false
-    private var isDelayed = false
 
     override fun initLayoutView(): Int = R.layout.activity_range_hood
 
@@ -88,28 +85,6 @@
 
             override fun onDpUpdate(devId: String?, dpStr: String?) {
                 Log.d(kTag, "onDpUpdate: $dpStr")
-                val parseObject = JSONObject.parseObject(dpStr)
-                parseObject.keys.forEach {
-                    when (it) {
-                        "1" -> {
-                            isWorking = parseObject[it] as Boolean
-                        }
-                        "2" -> {
-                            isDelayed = parseObject[it] as Boolean
-                        }
-                        "105" -> {
-                            if (isWorking) {
-                                delayTimeView.text = if (isDelayed) {
-                                    String.format("${parseObject[it].toString()}s")
-                                } else {
-                                    "0s"
-                                }
-                            } else {
-                                delayTimeView.text = "未开启"
-                            }
-                        }
-                    }
-                }
 
                 val controlMsg = ControlPageFragment.weakReference.obtainMessage()
                 controlMsg.what = 2022092301
diff --git a/app/src/main/res/layout/activity_range_hood.xml b/app/src/main/res/layout/activity_range_hood.xml
index 7460bd1..c255b3c 100644
--- a/app/src/main/res/layout/activity_range_hood.xml
+++ b/app/src/main/res/layout/activity_range_hood.xml
@@ -20,18 +20,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="延时倒计时" />
-
-        <TextView
-            android:id="@+id/delayTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="@dimen/dp_5"
-            android:text="0秒" />
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/deviceTabLayout"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_device_rangehood_status.xml b/app/src/main/res/layout/fragment_device_rangehood_status.xml
index 7ae6579..6f1efd2 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_status.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_status.xml
@@ -158,6 +158,34 @@
             android:paddingHorizontal="@dimen/dp_10"
             android:paddingVertical="@dimen/dp_15">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="延时倒计时"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/delayTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0秒"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_15">
+
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

diff --git a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
index aa30006..0598a38 100644
--- a/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/rangehood/StatusPageFragment.kt
@@ -24,6 +24,7 @@
 
     private val kTag = "StatusPageFragment"
     private var isDeviceWorking = false
+    private var isDelayed = false
     private val wifi by lazy { requireContext().applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager }
     private val paramObject by lazy { org.json.JSONObject() }//数据Json对象
     private val dataTimer by lazy { Timer() }//数据上传Timer
@@ -91,6 +92,9 @@
                             }
                             paramObject.put("switchStatus", switchStatus)
                         }
+                        "2" -> {
+                            isDelayed = parseObject[it] as Boolean
+                        }
                         "11" -> {//设备状态，[off, low, high, strong, air, fangdaoguan, wash, delay, xunhang]
                             deviceStateView.text = when (parseObject[it] as String) {
                                 "low" -> "低档"
@@ -113,6 +117,17 @@
                             }
                             paramObject.put("runTime", workingTimeView.text)
                         }
+                        "105" -> {
+                            if (isDeviceWorking) {
+                                delayTimeView.text = if (isDelayed) {
+                                    String.format("${parseObject[it].toString()}s")
+                                } else {
+                                    "0s"
+                                }
+                            } else {
+                                delayTimeView.text = "未开启"
+                            }
+                        }
                         "106" -> {//烟灶联动
                             if (parseObject[it] as Boolean) {
                                 linkageView.text = "开"
diff --git a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
index c02c881..3c3f0fe 100644
--- a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt
@@ -6,7 +6,6 @@
 import android.view.LayoutInflater
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.alibaba.fastjson.JSONObject
 import com.bumptech.glide.Glide
 import com.casic.br.R
 import com.casic.br.adapter.TabPagerAdapter
@@ -47,8 +46,6 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
     private lateinit var tuyaOTA: ITuyaOta
     private lateinit var deviceInstance: ITuyaDevice
-    private var isWorking = false
-    private var isDelayed = false
 
     override fun initLayoutView(): Int = R.layout.activity_range_hood
 
@@ -88,28 +85,6 @@
 
             override fun onDpUpdate(devId: String?, dpStr: String?) {
                 Log.d(kTag, "onDpUpdate: $dpStr")
-                val parseObject = JSONObject.parseObject(dpStr)
-                parseObject.keys.forEach {
-                    when (it) {
-                        "1" -> {
-                            isWorking = parseObject[it] as Boolean
-                        }
-                        "2" -> {
-                            isDelayed = parseObject[it] as Boolean
-                        }
-                        "105" -> {
-                            if (isWorking) {
-                                delayTimeView.text = if (isDelayed) {
-                                    String.format("${parseObject[it].toString()}s")
-                                } else {
-                                    "0s"
-                                }
-                            } else {
-                                delayTimeView.text = "未开启"
-                            }
-                        }
-                    }
-                }
 
                 val controlMsg = ControlPageFragment.weakReference.obtainMessage()
                 controlMsg.what = 2022092301
diff --git a/app/src/main/res/layout/activity_range_hood.xml b/app/src/main/res/layout/activity_range_hood.xml
index 7460bd1..c255b3c 100644
--- a/app/src/main/res/layout/activity_range_hood.xml
+++ b/app/src/main/res/layout/activity_range_hood.xml
@@ -20,18 +20,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="延时倒计时" />
-
-        <TextView
-            android:id="@+id/delayTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="@dimen/dp_5"
-            android:text="0秒" />
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/deviceTabLayout"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_device_rangehood_status.xml b/app/src/main/res/layout/fragment_device_rangehood_status.xml
index 7ae6579..6f1efd2 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_status.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_status.xml
@@ -158,6 +158,34 @@
             android:paddingHorizontal="@dimen/dp_10"
             android:paddingVertical="@dimen/dp_15">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="延时倒计时"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/delayTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0秒"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_15">
+
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/add_device_bottom_nav_menu.xml b/app/src/main/res/menu/add_device_bottom_nav_menu.xml
deleted file mode 100644
index e392fcf..0000000
--- a/app/src/main/res/menu/add_device_bottom_nav_menu.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <item
-        android:id="@+id/nav_scan"
-        android:enabled="true"
-        android:title="扫码添加"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/nav_type"
-        android:enabled="true"
-        android:title="按型号添加"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/nav_nearby"
-        android:enabled="true"
-        android:title="附近设备"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-</menu>
\ No newline at end of file