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 2bd8caa..5605bd4 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -129,7 +129,7 @@
     private var signalTask: TimerTask? = null
     private var searchMarkerTimer: Timer? = null
     private lateinit var aMap: AMap
-    private lateinit var taskBean: TaskBean
+    private lateinit var task: TaskBean
     private lateinit var taskId: String
 
     /***inner class 需要用到*****start*/
@@ -308,38 +308,38 @@
 
         //巡检
         binding.inspectionButton.setOnClickListener {
-            val task = DataBaseManager.get.queryDistinctTask()
-            if (task.isNotEmpty()) {
+            val tasks = DataBaseManager.get.queryDistinctTask()
+            if (tasks.isNotEmpty()) {
                 val arrayList = ArrayList<String>()
-                task.forEachIndexed { index, taskBean ->
-                    arrayList.add("任务${index + 1}：${taskBean.taskId}，${taskBean.desc}")
+                tasks.forEachIndexed { index, bean ->
+                    arrayList.add("任务${index + 1}：${bean.taskId}，${bean.desc}")
                 }
 
                 BottomActionSheet.Builder().setContext(this).setItemTextColor(Color.BLUE)
                     .setActionItemTitle(arrayList)
                     .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener {
                         override fun onActionItemClick(position: Int) {
-                            taskBean = task[position]
-                            SaveKeyValues.putValue(LocaleConstant.TASK_ID, taskBean.taskId)
+                            task = tasks[position]
+                            SaveKeyValues.putValue(LocaleConstant.TASK_ID, task.taskId)
                             AlertControlDialog.Builder().setContext(context).setTitle("提示")
                                 .setMessage("请选择操作方式").setPositiveButton("执行工单")
                                 .setNegativeButton("提交工单")
                                 .setOnDialogButtonClickListener(object :
                                     AlertControlDialog.OnDialogButtonClickListener {
                                     override fun onConfirmClick() {
-                                        detectRedrawGraphic(taskBean.taskId)
+                                        detectRedrawGraphic(task.taskId)
 
                                         val latLng = LatLng(
-                                            taskBean.lat.toDouble(), taskBean.lng.toDouble()
+                                            task.lat.toDouble(), task.lng.toDouble()
                                         )
                                         aMap.moveCamera(
                                             CameraUpdateFactory.newLatLngZoom(latLng, 16f)
                                         )
-                                        uploadTask(taskBean.taskId, "1")
+                                        uploadTask(task.taskId, "1")
                                     }
 
                                     override fun onCancelClick() {
-                                        uploadTask(taskBean.taskId, "2")
+                                        uploadTask(task.taskId, "2")
                                     }
                                 }).build().show()
                         }
@@ -464,7 +464,6 @@
                     LoadingDialogHub.dismiss()
                 }
             }
-            detectRedrawGraphic(taskBean.taskId)
         }
     }
 
@@ -1016,6 +1015,7 @@
         fun bindingValue(markerId: String) {
             LoadingDialogHub.dismiss()
             soundPool.autoPause()
+            countDownTimer.cancel()
             binding.readMarkerButton.isEnabled = true
 
             //降低串口电位
@@ -1450,7 +1450,6 @@
     inner class SearchMarkerNewDialog(context: Context) : Dialog(context) {
 
         private val binding: DialogSearchMarkerNewBinding by binding()
-        private val decimal by lazy { DecimalFormat("0.0") }
         private var isPlaying = false
         private var markerId = ""
         private lateinit var searchMarkerTimer: Timer
@@ -1459,7 +1458,6 @@
         private lateinit var countDownTimer: CountDownTimer
 
         var isDetectMarker = false
-        var taskBean: TaskBean? = null
 
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
@@ -1614,7 +1612,7 @@
                     binding.searchResultView.setBackgroundResource(R.mipmap.bg_small_text_green)
 
                     //自动上传标识器
-                    taskBean = DataBaseManager.get.queryTaskLabelByIdAndState(markerId, "未开始")
+                    val taskBean = DataBaseManager.get.queryTaskLabelByIdAndState(markerId, "未开始")
 //                    taskBean?.apply {
 //                        /**
 //                         * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键