From 5d551ca83aa52d9e8691a7a4ae7c0b15cc6e9b4d Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 6 Jun 2024 17:37:46 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.4]=E5=86=B7=E5=90=AF=E5=8A=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E8=BF=9B=E5=BA=A6View=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/widget/ConnectionProcessView.kt | 13 +++++++++++--
 .../src/main/res/layout/view_connection_process.xml |  7 ++++---
 2 files changed, 15 insertions(+), 5 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 e9ead64430..194423bc35 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
@@ -3,11 +3,11 @@ package com.mogo.eagle.core.function.hmi.ui.widget
 import android.content.Context
 import android.os.CountDownTimer
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.hmi.R
@@ -80,10 +80,15 @@ class ConnectionProcessView @JvmOverloads constructor(
             if(CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ssmAutoPilotReady){
                 dismissConnectionView()
             }else{
-                connectIPCSuccess()
+                if(isFirstTimeConnect || isDisconnectTimeout){
+                    connectIPCSuccess()
+                    ssmConnectStatus = false
+                    autopilotReadyStatus = false
+                }
             }
             isDisconnectTimeout = false
             disconnectTimer?.cancel()
+            disconnectTimer = null
         }else{
             if(ipcConnectStatus && disconnectTimer == null && !isDisconnectTimeout){
                 //域控断连1分钟超时倒计时
@@ -92,6 +97,10 @@ class ConnectionProcessView @JvmOverloads constructor(
                 connectSSMTimer?.cancel()
                 autopilotReadyTimer?.cancel()
             }
+            if(ipcConnectStatus && this.isVisible){
+                showIPCConnectFailView()
+            }
+            ipcConnectStatus = false
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
index 56254574dd..dcac1411be 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
@@ -13,9 +13,10 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:progress="25"
-        android:paddingBottom="@dimen/dp_10"
-        android:paddingStart="@dimen/dp_3"
-        android:paddingEnd="@dimen/dp_3"
+        android:paddingBottom="@dimen/dp_8"
+        android:paddingStart="@dimen/dp_5"
+        android:paddingEnd="@dimen/dp_5"
+        android:paddingTop="@dimen/dp_3"
         android:background="@drawable/bg_connection_progress"
         android:progressDrawable="@drawable/connection_progress_style"
         />