diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 67d4f53..aa81f6b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -1,11 +1,11 @@
 package com.casic.detector.utils
 
 import com.casic.detector.base.BaseApplication
-import com.casic.detector.bean.LabelBean
+import com.casic.detector.bean.MarkerLocalBean
 import com.casic.detector.bean.PipeLocalBean
 import com.casic.detector.bean.TaskLocalBean
 import com.casic.detector.bean.TaskMarkerLocalBean
-import com.casic.detector.greendao.LabelBeanDao
+import com.casic.detector.greendao.MarkerLocalBeanDao
 import com.casic.detector.greendao.TaskLocalBeanDao
 import com.casic.detector.greendao.TaskMarkerLocalBeanDao
 import com.casic.detector.model.PipelineModel
@@ -173,47 +173,52 @@
         taskMarkerLocalBeanDao.update(marker)
     }
 
-//    =============================================================================================
-
-    private var labelBeanDao = BaseApplication.get().getDaoSession().labelBeanDao
-    private val pipeLocalBeanDao = BaseApplication.get().getDaoSession().pipeLocalBeanDao
-
-    fun clearTaskLabels() {
-        labelBeanDao.deleteAll()
-    }
-
-    fun insertTaskLabel(bean: LabelBean) {
-        labelBeanDao.insert(bean)
-    }
-
-    fun loadTaskLabels(): MutableList<LabelBean> {
-        return labelBeanDao.loadAll()
-    }
-
-    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
-        val property = when (selectedItem) {
-            LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
-            LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
-            LocaleConstant.SPINNER_ARRAY[2] -> LabelBeanDao.Properties.Line
-            LocaleConstant.SPINNER_ARRAY[3] -> LabelBeanDao.Properties.Road
-            LocaleConstant.SPINNER_ARRAY[4] -> LabelBeanDao.Properties.Owner
-            LocaleConstant.SPINNER_ARRAY[5] -> LabelBeanDao.Properties.Person
-            LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
-            else -> LabelBeanDao.Properties.Remark
-        }
-        return if (value == null) {
-            labelBeanDao.queryBuilder().where(property.isNotNull).list()
-        } else {
-            labelBeanDao.queryBuilder().where(property.eq(value)).list()
-        }
-    }
-
-    fun queryLabelById(identifierId: String): List<LabelBean> {
-        return labelBeanDao.queryBuilder()
-            .where(LabelBeanDao.Properties.IdentifierId.eq(identifierId))
+    fun queryMarkerByState(state: String): List<TaskMarkerLocalBean> {
+        return taskMarkerLocalBeanDao.queryBuilder()
+            .where(TaskMarkerLocalBeanDao.Properties.IsDetected.eq(state))
             .list()
     }
 
+    private var markerLocalBeanDao = BaseApplication.get().getDaoSession().markerLocalBeanDao
+
+    fun clearMarkers() {
+        markerLocalBeanDao.deleteAll()
+    }
+
+    fun saveMarkerInLocale(bean: MarkerLocalBean) {
+        markerLocalBeanDao.insert(bean)
+    }
+
+    fun loadMarkers(): MutableList<MarkerLocalBean> {
+        return markerLocalBeanDao.loadAll()
+    }
+
+    fun loadMarkersByCondition(selectedItem: String, value: String?): MutableList<MarkerLocalBean> {
+        val property = when (selectedItem) {
+            LocaleConstant.SPINNER_ARRAY[0] -> MarkerLocalBeanDao.Properties.MarkerId
+            LocaleConstant.SPINNER_ARRAY[1] -> MarkerLocalBeanDao.Properties.Area
+            LocaleConstant.SPINNER_ARRAY[2] -> MarkerLocalBeanDao.Properties.Line
+            LocaleConstant.SPINNER_ARRAY[3] -> MarkerLocalBeanDao.Properties.Road
+            LocaleConstant.SPINNER_ARRAY[4] -> MarkerLocalBeanDao.Properties.Owner
+            LocaleConstant.SPINNER_ARRAY[5] -> MarkerLocalBeanDao.Properties.InstallationDept
+            LocaleConstant.SPINNER_ARRAY[6] -> MarkerLocalBeanDao.Properties.UpdateTime
+            else -> MarkerLocalBeanDao.Properties.Remark
+        }
+        return if (value == null) {
+            markerLocalBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            markerLocalBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
+    }
+
+    fun queryMarkerById(markerId: String): List<MarkerLocalBean> {
+        return markerLocalBeanDao.queryBuilder()
+            .where(MarkerLocalBeanDao.Properties.MarkerId.eq(markerId))
+            .list()
+    }
+
+    private val pipeLocalBeanDao = BaseApplication.get().getDaoSession().pipeLocalBeanDao
+
     /**
      * 清除管线本地缓存
      * */

diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 67d4f53..aa81f6b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -1,11 +1,11 @@
 package com.casic.detector.utils
 
 import com.casic.detector.base.BaseApplication
-import com.casic.detector.bean.LabelBean
+import com.casic.detector.bean.MarkerLocalBean
 import com.casic.detector.bean.PipeLocalBean
 import com.casic.detector.bean.TaskLocalBean
 import com.casic.detector.bean.TaskMarkerLocalBean
-import com.casic.detector.greendao.LabelBeanDao
+import com.casic.detector.greendao.MarkerLocalBeanDao
 import com.casic.detector.greendao.TaskLocalBeanDao
 import com.casic.detector.greendao.TaskMarkerLocalBeanDao
 import com.casic.detector.model.PipelineModel
@@ -173,47 +173,52 @@
         taskMarkerLocalBeanDao.update(marker)
     }
 
-//    =============================================================================================
-
-    private var labelBeanDao = BaseApplication.get().getDaoSession().labelBeanDao
-    private val pipeLocalBeanDao = BaseApplication.get().getDaoSession().pipeLocalBeanDao
-
-    fun clearTaskLabels() {
-        labelBeanDao.deleteAll()
-    }
-
-    fun insertTaskLabel(bean: LabelBean) {
-        labelBeanDao.insert(bean)
-    }
-
-    fun loadTaskLabels(): MutableList<LabelBean> {
-        return labelBeanDao.loadAll()
-    }
-
-    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
-        val property = when (selectedItem) {
-            LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
-            LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
-            LocaleConstant.SPINNER_ARRAY[2] -> LabelBeanDao.Properties.Line
-            LocaleConstant.SPINNER_ARRAY[3] -> LabelBeanDao.Properties.Road
-            LocaleConstant.SPINNER_ARRAY[4] -> LabelBeanDao.Properties.Owner
-            LocaleConstant.SPINNER_ARRAY[5] -> LabelBeanDao.Properties.Person
-            LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
-            else -> LabelBeanDao.Properties.Remark
-        }
-        return if (value == null) {
-            labelBeanDao.queryBuilder().where(property.isNotNull).list()
-        } else {
-            labelBeanDao.queryBuilder().where(property.eq(value)).list()
-        }
-    }
-
-    fun queryLabelById(identifierId: String): List<LabelBean> {
-        return labelBeanDao.queryBuilder()
-            .where(LabelBeanDao.Properties.IdentifierId.eq(identifierId))
+    fun queryMarkerByState(state: String): List<TaskMarkerLocalBean> {
+        return taskMarkerLocalBeanDao.queryBuilder()
+            .where(TaskMarkerLocalBeanDao.Properties.IsDetected.eq(state))
             .list()
     }
 
+    private var markerLocalBeanDao = BaseApplication.get().getDaoSession().markerLocalBeanDao
+
+    fun clearMarkers() {
+        markerLocalBeanDao.deleteAll()
+    }
+
+    fun saveMarkerInLocale(bean: MarkerLocalBean) {
+        markerLocalBeanDao.insert(bean)
+    }
+
+    fun loadMarkers(): MutableList<MarkerLocalBean> {
+        return markerLocalBeanDao.loadAll()
+    }
+
+    fun loadMarkersByCondition(selectedItem: String, value: String?): MutableList<MarkerLocalBean> {
+        val property = when (selectedItem) {
+            LocaleConstant.SPINNER_ARRAY[0] -> MarkerLocalBeanDao.Properties.MarkerId
+            LocaleConstant.SPINNER_ARRAY[1] -> MarkerLocalBeanDao.Properties.Area
+            LocaleConstant.SPINNER_ARRAY[2] -> MarkerLocalBeanDao.Properties.Line
+            LocaleConstant.SPINNER_ARRAY[3] -> MarkerLocalBeanDao.Properties.Road
+            LocaleConstant.SPINNER_ARRAY[4] -> MarkerLocalBeanDao.Properties.Owner
+            LocaleConstant.SPINNER_ARRAY[5] -> MarkerLocalBeanDao.Properties.InstallationDept
+            LocaleConstant.SPINNER_ARRAY[6] -> MarkerLocalBeanDao.Properties.UpdateTime
+            else -> MarkerLocalBeanDao.Properties.Remark
+        }
+        return if (value == null) {
+            markerLocalBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            markerLocalBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
+    }
+
+    fun queryMarkerById(markerId: String): List<MarkerLocalBean> {
+        return markerLocalBeanDao.queryBuilder()
+            .where(MarkerLocalBeanDao.Properties.MarkerId.eq(markerId))
+            .list()
+    }
+
+    private val pipeLocalBeanDao = BaseApplication.get().getDaoSession().pipeLocalBeanDao
+
     /**
      * 清除管线本地缓存
      * */
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 6980416..bc68f9f 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -1252,7 +1252,7 @@
                 }
 
                 //先存本地再上传服务器
-                saveLabelInLocal()
+                saveMarkerInLocal()
 
                 isInstallMarker = true
                 taskViewModel.installLabel(
@@ -1315,7 +1315,7 @@
                 out.write('2'.code)
                 out.flush()
 
-                countDownTimer = object : CountDownTimer(5 * 1000, 1000) {
+                countDownTimer = object : CountDownTimer(10 * 1000, 1000) {
                     override fun onTick(millisUntilFinished: Long) {
 
                     }
@@ -1329,7 +1329,7 @@
                         gpioManager.setGpioLow("18")
 
                         isReadMarker = false
-                        "读取此标识器ID超时，请重试".show(context)
+                        "读取此标识器ID超时，请退出应用再试".show(context)
                     }
                 }
                 countDownTimer.start()
@@ -1493,7 +1493,7 @@
             "personDeptView".setDefaultValue("")
         }
 
-        private fun saveLabelInLocal() {
+        private fun saveMarkerInLocal() {
             val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
 
             val marker = MarkerLocalBean()