diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
index 1d38a3e..1e84dc8 100644
--- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
@@ -37,7 +37,6 @@
                 SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId)
 
                 navigatePageTo<MainActivity>()
-//                navigatePageTo<MainBaiduMapActivity>()
                 finish()
             }
         }

diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
index 1d38a3e..1e84dc8 100644
--- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt
@@ -37,7 +37,6 @@
                 SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId)
 
                 navigatePageTo<MainActivity>()
-//                navigatePageTo<MainBaiduMapActivity>()
                 finish()
             }
         }
diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt
index 211fc9f..45acaaf 100644
--- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt
@@ -285,41 +285,45 @@
             override fun onDataReceived(buffer: ByteArray) {
                 if (buffer.first() == 78.toByte()) {
                     val energy = buffer.handleSignalStrength().take(10).hexToString()
-                    signalEnergy = energy.substring(1).toInt()
-                    if (signalEnergy >= 4000) {
-                        soundPool.play(fastSoundResourceId, 1f, 1f, 0, 0, 1f)
-                    } else {
-                        soundPool.play(slowSoundResourceId, 1f, 1f, 0, 0, 1f)
-                    }
+                    try {
+                        signalEnergy = energy.substring(1).toInt()
+                        if (signalEnergy >= 4000) {
+                            soundPool.play(fastSoundResourceId, 1f, 1f, 0, 0, 1f)
+                        } else {
+                            soundPool.play(slowSoundResourceId, 1f, 1f, 0, 0, 1f)
+                        }
 
-                    //通过设置进度条表示能量值
-                    binding.energyPgBar.progress = signalEnergy
-                    binding.energyValueView.text = "${signalEnergy}dB"
+                        //通过设置进度条表示能量值
+                        binding.energyPgBar.progress = signalEnergy
+                        binding.energyValueView.text = "${signalEnergy}dB"
 
-                    //根据信号强度更新界面
-                    if (signalEnergy <= 700) {//18°
-                        binding.energyTipsView.text = "信号较弱，可能距离较远"
-                        binding.energyTipsView.setTextColor(Color.parseColor("#8D1717"))
-                        binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_red)
+                        //根据信号强度更新界面
+                        if (signalEnergy <= 700) {//18°
+                            binding.energyTipsView.text = "信号较弱，可能距离较远"
+                            binding.energyTipsView.setTextColor(Color.parseColor("#8D1717"))
+                            binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_red)
 
-                        binding.depthButton.isEnabled = false
-                        binding.depthButton.setTextColor(Color.parseColor("#CCCCCC"))
-                        binding.depthButton.setBackgroundResource(R.mipmap.left_button_disable)
-                        binding.markerInfoButton.isEnabled = false
-                        binding.markerInfoButton.setTextColor(Color.parseColor("#CCCCCC"))
-                        binding.markerInfoButton.setBackgroundResource(R.mipmap.right_button_disable)
+                            binding.depthButton.isEnabled = false
+                            binding.depthButton.setTextColor(Color.parseColor("#CCCCCC"))
+                            binding.depthButton.setBackgroundResource(R.mipmap.left_button_disable)
+                            binding.markerInfoButton.isEnabled = false
+                            binding.markerInfoButton.setTextColor(Color.parseColor("#CCCCCC"))
+                            binding.markerInfoButton.setBackgroundResource(R.mipmap.right_button_disable)
 
-                        binding.searchResultView.text = "未检测到标识器"
-                        binding.searchResultView.setTextColor(Color.parseColor("#8D1717"))
-                        binding.searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red)
-                    } else if (signalEnergy >= 4100) {
-                        binding.energyTipsView.text = "信号极强，接近标识器正上方"
-                        binding.energyTipsView.setTextColor(Color.parseColor("#428d00"))
-                        binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_green)
-                    } else {
-                        binding.energyTipsView.text = "已靠近，请继续移动位置"
-                        binding.energyTipsView.setTextColor(Color.parseColor("#8C5700"))
-                        binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_yellow)
+                            binding.searchResultView.text = "未检测到标识器"
+                            binding.searchResultView.setTextColor(Color.parseColor("#8D1717"))
+                            binding.searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red)
+                        } else if (signalEnergy >= 4100) {
+                            binding.energyTipsView.text = "信号极强，接近标识器正上方"
+                            binding.energyTipsView.setTextColor(Color.parseColor("#428d00"))
+                            binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_green)
+                        } else {
+                            binding.energyTipsView.text = "已靠近，请继续移动位置"
+                            binding.energyTipsView.setTextColor(Color.parseColor("#8C5700"))
+                            binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_yellow)
+                        }
+                    } catch (e: NumberFormatException) {
+                        e.printStackTrace()
                     }
                 } else {
                     Log.d(kTag, buffer.contentToString())