diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
index 5138cd0cee..a3c9cc0390 100644
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
@@ -110,9 +110,9 @@ class PM2HPMapFragment :
                 it?.let{
                     builder.rotate(it.angle.toFloat())
                 }
+                val overlayManager = getOverlayManager()
+                overlayManager?.showOrUpdatePoint(builder.build())
             }
-            val overlayManager = getOverlayManager()
-            overlayManager?.showOrUpdatePoint(builder.build())
         }
         OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
     }
diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
index e278d6c4ae..f0efcd42e8 100644
--- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
@@ -109,9 +109,10 @@ class PM2HPMapFragment :
                 it?.let{
                     builder.rotate(it.angle.toFloat())
                 }
+                val overlayManager = CallerMapUIServiceManager.getOverlayManager()
+                overlayManager?.showOrUpdatePoint(builder.build())
             }
-            val overlayManager = CallerMapUIServiceManager.getOverlayManager()
-            overlayManager?.showOrUpdatePoint(builder.build())
+
         }
         OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
index c8d9d7023c..e80206edee 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
@@ -84,6 +84,9 @@ class ConnectionProcessView @JvmOverloads constructor(
             CallerAutoPilotStatusListenerManager.removeListener(TAG)
             //隐藏视图
             dismissConnectionView()
+            //如果已经开始连接倒计时，则取消Timer
+            connectSSMTimer?.cancel()
+            autopilotReadyTimer?.cancel()
         }
     }
 
@@ -212,14 +215,16 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示域控连接成功视图
      */
     private fun showIPCConnectSuccessView(){
-        ThreadUtils.runOnUiThread {
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(5,3,5,8)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
-            pbConnectionProgress.progress = 25
-            tvConnectionStatus.setPadding(0,0,0,10)
-            tvConnectionStatus.text = "系统启动中..."
-            clConnectionTip.visibility = View.GONE
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread {
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(5,3,5,8)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
+                pbConnectionProgress.progress = 25
+                tvConnectionStatus.setPadding(0,0,0,10)
+                tvConnectionStatus.text = "系统启动中..."
+                clConnectionTip.visibility = View.GONE
+            }
         }
     }
 
@@ -227,14 +232,16 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示SSM连接成功视图
      */
     private fun showSSMConnectSuccessView(){
-        ThreadUtils.runOnUiThread{
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(5,3,5,8)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
-            pbConnectionProgress.progress = 50
-            tvConnectionStatus.setPadding(0,0,0,10)
-            tvConnectionStatus.text = "系统启动中..."
-            clConnectionTip.visibility = View.GONE
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread{
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(5,3,5,8)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
+                pbConnectionProgress.progress = 50
+                tvConnectionStatus.setPadding(0,0,0,10)
+                tvConnectionStatus.text = "系统启动中..."
+                clConnectionTip.visibility = View.GONE
+            }
         }
     }
 
@@ -242,14 +249,16 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示冷启动成功视图
      */
     private fun showAutopilotReadySuccessView(){
-        ThreadUtils.runOnUiThread{
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(0,0,0,0)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style)
-            pbConnectionProgress.progress = 100
-            tvConnectionStatus.setPadding(0,0,0,0)
-            tvConnectionStatus.text = "系统启动成功"
-            clConnectionTip.visibility = View.GONE
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread{
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(0,0,0,0)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style)
+                pbConnectionProgress.progress = 100
+                tvConnectionStatus.setPadding(0,0,0,0)
+                tvConnectionStatus.text = "系统启动成功"
+                clConnectionTip.visibility = View.GONE
+            }
         }
     }
 
@@ -257,16 +266,18 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示域控连接失败视图
      */
     private fun showIPCConnectFailView(){
-        ThreadUtils.runOnUiThread {
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(0,0,0,0)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
-            pbConnectionProgress.progress = 25
-            tvConnectionStatus.setPadding(0,0,0,0)
-            tvConnectionStatus.text = "系统启动异常"
-            clConnectionTip.visibility = View.VISIBLE
-            tvConnectionTipTitle.text = "Telematics连接异常"
-            tvConnectionTipContent.text = "建议重启车辆并上报问题"
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread {
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(0,0,0,0)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
+                pbConnectionProgress.progress = 25
+                tvConnectionStatus.setPadding(0,0,0,0)
+                tvConnectionStatus.text = "系统启动异常"
+                clConnectionTip.visibility = View.VISIBLE
+                tvConnectionTipTitle.text = "Telematics连接异常"
+                tvConnectionTipContent.text = "建议重启车辆并上报问题"
+            }
         }
     }
 
@@ -274,16 +285,18 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示SSM连接失败视图
      */
     private fun showSSMConnectFailView(){
-        ThreadUtils.runOnUiThread {
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(0,0,0,0)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
-            pbConnectionProgress.progress = 50
-            tvConnectionStatus.setPadding(0,0,0,0)
-            tvConnectionStatus.text = "系统启动异常"
-            clConnectionTip.visibility = View.VISIBLE
-            tvConnectionTipTitle.text = "SSM连接异常"
-            tvConnectionTipContent.text = "建议重启车辆并上报问题"
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread {
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(0,0,0,0)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
+                pbConnectionProgress.progress = 50
+                tvConnectionStatus.setPadding(0,0,0,0)
+                tvConnectionStatus.text = "系统启动异常"
+                clConnectionTip.visibility = View.VISIBLE
+                tvConnectionTipTitle.text = "SSM连接异常"
+                tvConnectionTipContent.text = "建议重启车辆并上报问题"
+            }
         }
     }
 
@@ -291,16 +304,18 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示SSM冷启动失败视图
      */
     private fun showAutopilotReadyFailView(){
-        ThreadUtils.runOnUiThread {
-            this.visibility = View.VISIBLE
-            pbConnectionProgress.setPadding(0,0,0,0)
-            pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
-            pbConnectionProgress.progress = 100
-            tvConnectionStatus.setPadding(0,0,0,0)
-            tvConnectionStatus.text = "系统启动异常"
-            clConnectionTip.visibility = View.VISIBLE
-            tvConnectionTipTitle.text = "系统冷启动异常"
-            tvConnectionTipContent.text = "建议重启车辆并上报问题"
+        if(HmiBuildConfig.isShowConnectionProgressView){
+            ThreadUtils.runOnUiThread {
+                this.visibility = View.VISIBLE
+                pbConnectionProgress.setPadding(0,0,0,0)
+                pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
+                pbConnectionProgress.progress = 100
+                tvConnectionStatus.setPadding(0,0,0,0)
+                tvConnectionStatus.text = "系统启动异常"
+                clConnectionTip.visibility = View.VISIBLE
+                tvConnectionTipTitle.text = "系统冷启动异常"
+                tvConnectionTipContent.text = "建议重启车辆并上报问题"
+            }
         }
     }