From 9cd68d8d78264998ce7c1a95ead4c55682eb2063 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 14 Jun 2024 10:59:58 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.4]=E5=86=B7=E5=90=AF=E5=8A=A8=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/widget/ConnectionProcessView.kt    | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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 f2095a67d5..114e993a37 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
@@ -92,6 +92,7 @@ class ConnectionProcessView @JvmOverloads constructor(
         status: AdasConstants.IpcConnectionStatus,
         reason: String?
     ) {
+        Log.i(TAG,"onAutopilotIpcConnectStatusChanged status="+status.name)
         if(HmiBuildConfig.isShowConnectionProgressView){
             if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
                 //域控连接成功
@@ -132,11 +133,15 @@ class ConnectionProcessView @JvmOverloads constructor(
      * HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用
      */
     override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
+        Log.i(TAG,"onAutopilotStatusRespByQuery status autoPilotReady="+status.autoPilotReady)
         if(HmiBuildConfig.isShowConnectionProgressView){
+            Log.i(TAG,"HmiBuildConfig.isShowConnectionProgressView="+HmiBuildConfig.isShowConnectionProgressView)
             if(status.autoPilotReady){
+                Log.i(TAG,"status.autoPilotReady 为true 冷启动成功")
                 //冷启动成功
                 autopilotReady()
             }else{
+                Log.i(TAG,"status.autoPilotReady 为false")
                 //SSM连接成功
                 connectSSMSuccess()
             }
@@ -150,11 +155,15 @@ class ConnectionProcessView @JvmOverloads constructor(
      * @param statusInf 数据
      */
     override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
+        Log.i(TAG,"onSystemStatus status autoPilotReady="+statusInf.autoPilotReady)
         if(HmiBuildConfig.isShowConnectionProgressView){
+            Log.i(TAG,"HmiBuildConfig.isShowConnectionProgressView="+HmiBuildConfig.isShowConnectionProgressView)
             if(statusInf.autoPilotReady){
+                Log.i(TAG,"status.autoPilotReady 为true 冷启动成功")
                 //冷启动成功
                 autopilotReady()
             }else{
+                Log.i(TAG,"status.autoPilotReady 为false")
                 //SSM连接成功
                 connectSSMSuccess()
             }
@@ -186,14 +195,16 @@ class ConnectionProcessView @JvmOverloads constructor(
             autopilotReadyProcess()
         }
         ssmConnectStatus = true
-
+        autopilotReadyStatus = false
     }
 
     /**
      * 冷启动成功
      */
     private fun autopilotReady(){
+        Log.i(TAG,"autopilotReady autopilotReadyStatus="+autopilotReadyStatus)
         if(!autopilotReadyStatus){
+            Log.i(TAG,"展示冷启动成功View")
             showAutopilotReadySuccessView()
             //取消冷启动超时等待倒计时
             autopilotReadyTimer?.cancel()
@@ -252,6 +263,7 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示域控连接失败视图
      */
     private fun showIPCConnectFailView(){
+        Log.i(TAG,"展示域控连接失败视图showIPCConnectFailView")
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
             pbConnectionProgress.setPadding(0,0,0,0)
@@ -269,6 +281,7 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 展示SSM连接失败视图
      */
     private fun showSSMConnectFailView(){
+        Log.i(TAG,"展示SSM连接失败视图showSSMConnectFailView")
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
             pbConnectionProgress.setPadding(0,0,0,0)
@@ -303,8 +316,10 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 更新进度条进度
      */
     private fun updateProcess(){
-        currentProcess++
-        pbConnectionProgress.progress = currentProcess
+        if(currentProcess < 100){
+            currentProcess++
+            pbConnectionProgress.progress = currentProcess
+        }
     }
 
     /**
@@ -374,10 +389,13 @@ class ConnectionProcessView @JvmOverloads constructor(
                 }
 
                 override fun onFinish() {
+                    Log.i(TAG,"冷启动过程 onFinish")
                     if(CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ssmAutoPilotReady){
                         //冷启动成功
+                        Log.i(TAG,"onFinish 冷启动成功")
                         autopilotReady()
                     }else{
+                        Log.i(TAG,"onFinish 展示冷启动失败视图")
                         //展示冷启动失败视图
                         showAutopilotReadyFailView()
                     }
@@ -391,6 +409,7 @@ class ConnectionProcessView @JvmOverloads constructor(
      * 域控断连一分钟倒计时
      */
     private fun disconnectCountDown(){
+        Log.i(TAG,"域控断连一分钟倒计时")
         ThreadUtils.runOnUiThread {
             disconnectTimer = object: CountDownTimer(RECONNECTION_TIME,RECONNECTION_TIME){
                 override fun onTick(millisUntilFinished: Long) {