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 04fc7c6..4980d91 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -428,9 +428,9 @@
                         }
                     }).build().show()
             } else {
-                searchDialog.show()
+//                searchDialog.show()
                 //TODO 新探测界面
-//                searchNewDialog.show()
+                searchNewDialog.show()
             }
         }
 
@@ -1772,8 +1772,6 @@
                 }
             })
 
-            binding.distancePgBar.progress = 125
-
             //点位渲染，每次定位都计算当前位置与符合条件的点距离
             locationHub.getCurrentLocation(false, object : OnGetLocationListener {
                 override fun onAMapLocationGet(location: AMapLocation?) {
@@ -1795,16 +1793,18 @@
 
                         //获取MarkerId对应的标识器
                         DataBaseManager.get.queryLabelById(markerId).forEach {
-                            //设置距离进度条，距离最大3米，表盘最大125dp，需要转换
+                            //设置距离进度条，距离最大3米，需要转换
                             val distance = AMapUtils.calculateLineDistance(
                                 LatLng(latitude, longitude),
                                 LatLng(it.lat.toDouble(), it.lng.toDouble())
                             )
 
-                            //TODO 距离转换有问题
-                            val d = (distance / 3) * 125
-                            Log.d(kTag, "onAMapLocationGet => $d")
-                            binding.distancePgBar.progress = 125 - d.toInt()
+                            val progress = if (distance > 3) {
+                                100
+                            } else {
+                                (distance / 3) * 100
+                            }
+                            binding.distancePgBar.progress = progress.toInt()
                         }
                     }
                 }
@@ -1865,6 +1865,8 @@
                         binding.searchResultView.text = "未检测到标识器"
                         binding.searchResultView.setTextColor(Color.parseColor("#8D1717"))
                         binding.searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red)
+                        //未检测到标识器的时候距离设置为最大值
+                        binding.distancePgBar.progress = 100
                     } else if (energy >= 4100) {
                         binding.energyTipsView.text = "信号极强，接近标识器正上方"
                         binding.energyTipsView.setTextColor(Color.parseColor("#428d00"))