From 65c7b01eb10c7d0f67c14d2b00f65394d3b9120a Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 14 Jun 2024 20:04:19 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.4]=E8=B0=83=E6=95=B4=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=E9=80=BB=E8=BE=91=EF=BC=8C=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=BC=82=E5=B8=B8=E4=B9=8B=E5=90=8E=E5=A6=82=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9E=E6=8E=A5=E6=AD=A3=E5=B8=B8=E5=88=99=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AD=A3=E5=B8=B8=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/widget/ConnectionProcessView.kt         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 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 0dbd45eb70..ba45156c35 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
@@ -106,6 +106,10 @@ class ConnectionProcessView @JvmOverloads constructor(
                 isDisconnectTimeout = false
                 disconnectTimer?.cancel()
                 disconnectTimer = null
+                //如果之前IPC连接状态为未连接且当前显示异常状态，则改为显示域控连接成功状态
+                if(!ipcConnectStatus && clConnectionTip.visibility == View.VISIBLE){
+                    connectIPCSuccess()
+                }
             }else{
                 //域控连接失败
                 if(ipcConnectStatus && disconnectTimer == null && !isDisconnectTimeout){
@@ -132,7 +136,7 @@ class ConnectionProcessView @JvmOverloads constructor(
      */
     override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
         if(HmiBuildConfig.isShowConnectionProgressView){
-            if(status.autoPilotReady){
+            if(status.hasAutoPilotReady() && status.autoPilotReady){
                 //冷启动成功
                 autopilotReady()
             }else{
@@ -150,7 +154,7 @@ class ConnectionProcessView @JvmOverloads constructor(
      */
     override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
         if(HmiBuildConfig.isShowConnectionProgressView){
-            if(statusInf.autoPilotReady){
+            if(statusInf.hasAutoPilotReady() && statusInf.autoPilotReady){
                 //冷启动成功
                 autopilotReady()
             }else{
@@ -167,6 +171,7 @@ class ConnectionProcessView @JvmOverloads constructor(
         if(!ipcConnectStatus){
             showIPCConnectSuccessView()
             //开始连接SSM超时等待倒计时
+            currentProcess = 25
             connectSSMProcess()
         }
         ipcConnectStatus = true
@@ -182,6 +187,7 @@ class ConnectionProcessView @JvmOverloads constructor(
             //取消连接SSM超时等待倒计时
             connectSSMTimer?.cancel()
             //开始启动冷启动等待倒计时
+            currentProcess = 50
             autopilotReadyProcess()
         }
         ssmConnectStatus = true
@@ -357,6 +363,8 @@ class ConnectionProcessView @JvmOverloads constructor(
                 }
 
                 override fun onFinish() {
+                    //将SSM连接状态置为false
+                    ssmConnectStatus = false
                     //展示连接SSM失败视图
                     showSSMConnectFailView()
                 }
@@ -377,6 +385,8 @@ class ConnectionProcessView @JvmOverloads constructor(
                 }
 
                 override fun onFinish() {
+                    //将冷启动状态置为false
+                    autopilotReadyStatus = false
                     if(CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ssmAutoPilotReady){
                         //冷启动成功
                         autopilotReady()