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 ec2c6a9..c65b164 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -225,15 +225,30 @@
 
     override fun initEvent() {
         binding.rightImageView.setOnClickListener {
-            lifecycleScope.launch(Dispatchers.Main) {
-                val labels = withContext(Dispatchers.IO) {
-                    DataBaseManager.get.queryLabelById("0")
+            if (isFreeTask) {
+                AlertMessageDialog.Builder()
+                    .setContext(this)
+                    .setTitle("温馨提示")
+                    .setMessage("正在自由巡检任务中，请完成此次任务之后再使用此功能")
+                    .setPositiveButton("好的")
+                    .setOnDialogButtonClickListener(object :
+                        AlertMessageDialog.OnDialogButtonClickListener {
+                        override fun onConfirmClick() {
+
+                        }
+                    }).build().show()
+            } else {
+                lifecycleScope.launch(Dispatchers.Main) {
+                    val labels = withContext(Dispatchers.IO) {
+                        DataBaseManager.get.queryLabelById("0")
+                    }
+                    if (labels.isNotEmpty()) {
+                        samplePopupWindow.setShowPosition(4)
+                    }
+                    val x =
+                        binding.rightImageView.width - samplePopupWindow.width - 1.dp2px(context)
+                    samplePopupWindow.showAsDropDown(binding.rightImageView, x, 1.dp2px(context))
                 }
-                if (labels.isNotEmpty()) {
-                    samplePopupWindow.setShowPosition(4)
-                }
-                val x = binding.rightImageView.width - samplePopupWindow.width - 1.dp2px(context)
-                samplePopupWindow.showAsDropDown(binding.rightImageView, x, 1.dp2px(context))
             }
         }
 
@@ -255,7 +270,21 @@
             /**
              * 改为Dialog方式，避免频繁打开/关闭串口
              * */
-            installDialog.show()
+            if (isFreeTask) {
+                AlertMessageDialog.Builder()
+                    .setContext(this)
+                    .setTitle("温馨提示")
+                    .setMessage("正在自由巡检任务中，请完成此次任务之后再使用此功能")
+                    .setPositiveButton("好的")
+                    .setOnDialogButtonClickListener(object :
+                        AlertMessageDialog.OnDialogButtonClickListener {
+                        override fun onConfirmClick() {
+
+                        }
+                    }).build().show()
+            } else {
+                installDialog.show()
+            }
         }
 
         //查看
@@ -379,7 +408,7 @@
                 AlertMessageDialog.Builder()
                     .setContext(this)
                     .setTitle("温馨提示")
-                    .setMessage("正在自由巡检任务中，请完成此次任务之后再使用探测功能")
+                    .setMessage("正在自由巡检任务中，请完成此次任务之后再使用此功能")
                     .setPositiveButton("好的")
                     .setOnDialogButtonClickListener(object :
                         AlertMessageDialog.OnDialogButtonClickListener {
@@ -490,7 +519,9 @@
 
                 else -> {
                     if (installDialog.isInstallMarker) {
+                        installDialog.clearDefaultData()
                         installDialog.dismiss()
+                        "${installDialog.markerId}安装成功".show(context)
                     }
 
                     if (searchDialog.isDetectMarker) {
@@ -883,6 +914,7 @@
 
         var isReadMarker = false
         var isInstallMarker = false
+        var markerId = ""
 
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
@@ -1099,6 +1131,7 @@
         }
 
         fun bindingValue(markerId: String) {
+            this.markerId = markerId
             LoadingDialogHub.dismiss()
             soundPool.autoPause()
             countDownTimer.cancel()
@@ -1239,6 +1272,21 @@
             /**************************************************************************************/
         }
 
+        //清除默认数据
+        fun clearDefaultData() {
+            "markerObjectTypeView".setDefaultValue("")
+            "pipelineDiameterView".setDefaultValue("")
+            "buryDeepView".setDefaultValue("")
+            "bottomPipeDiameterView".setDefaultValue("")
+            "bottomPointDeepView".setDefaultValue("")
+            "areaView".setDefaultValue("")
+            "lineView".setDefaultValue("")
+            "roadView".setDefaultValue("")
+            "ownerView".setDefaultValue("")
+            "identifierDeepView".setDefaultValue("")
+            "personDeptView".setDefaultValue("")
+        }
+
         private fun saveLabelInLocal() {
             val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String