From 9c0bc3c8373d52c7ee5b3bca1e42354fb7c2ea93 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 28 Oct 2024 16:20:31 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=E5=86=B7=E5=90=AF=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/widget/ColdStartView.kt   | 20 +++++++++-
 .../src/main/res/layout/view_cold_start.xml   | 39 +++++++------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
index 08f3ac4c10..f0f2133eb4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
@@ -30,6 +30,7 @@ import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartNodeAdapter
 import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartNow
 import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartStatus
 import kotlinx.android.synthetic.main.view_cold_start.view.ivIpcConnectStatus
+import kotlinx.android.synthetic.main.view_cold_start.view.ivNodeListMask
 import kotlinx.android.synthetic.main.view_cold_start.view.ivSsmConnectStatus
 import kotlinx.android.synthetic.main.view_cold_start.view.rvNodeList
 import kotlinx.android.synthetic.main.view_cold_start.view.tvColdStartContent
@@ -122,6 +123,11 @@ class ColdStartView @JvmOverloads constructor(
         super.onDetachedFromWindow()
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
         CallerColdStartStateListenerManager.removeListener(TAG)
+        ipcRotationAnim?.cancel()
+        ssmRotationAnim?.cancel()
+        connectSSMTimer?.cancel()
+        coldStartRotationAnim?.cancel()
+        connectColdStartTimer?.cancel()
     }
 
     override fun onAutopilotIpcConnectStatusChanged(
@@ -284,6 +290,10 @@ class ColdStartView @JvmOverloads constructor(
                         //记录冷启动成功时间
                         ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis())
                     }
+                    if(it.eventStatus == SsmInfo.CSState.COLD_START_UNREADY || it.eventStatus == SsmInfo.CSState.COLD_START_TIMEOUT){
+                        //展示冷启动失败视图
+                        showColdStartFailView()
+                    }
                     tvColdStartContent.text = getColdStartEventStatus(it.eventStatus)
                     nodeList.clear()
                     it.nodeList.forEach {node->
@@ -334,7 +344,7 @@ class ColdStartView @JvmOverloads constructor(
             }
             // 超时
             SsmInfo.CSState.COLD_START_TIMEOUT->{
-                "系统启动异常，建议重启车辆并上报问题"
+                "系统启动超时，建议重启车辆并上报问题"
             }
         }
     }
@@ -398,6 +408,8 @@ class ColdStartView @JvmOverloads constructor(
         viewColdStartDivider.visibility = View.GONE
         ivColdStartStatus.visibility = View.GONE
         tvColdStartContent.visibility = View.GONE
+        rvNodeList.visibility = View.GONE
+        ivNodeListMask.visibility = View.GONE
         //域控连接成功埋点统计
         reason = "域控连接成功"
         ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectSuccess,reason)
@@ -425,6 +437,8 @@ class ColdStartView @JvmOverloads constructor(
         viewColdStartDivider.visibility = View.GONE
         ivColdStartStatus.visibility = View.GONE
         tvColdStartContent.visibility = View.GONE
+        rvNodeList.visibility = View.GONE
+        ivNodeListMask.visibility = View.GONE
         //域控连接失败埋点统计
         this.reason = "域控连接失败：$failReason"
         ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectFail,reason)
@@ -450,6 +464,8 @@ class ColdStartView @JvmOverloads constructor(
         viewColdStartDivider.visibility = View.GONE
         ivColdStartStatus.visibility = View.GONE
         tvColdStartContent.visibility = View.GONE
+        rvNodeList.visibility = View.GONE
+        ivNodeListMask.visibility = View.GONE
     }
 
     /**
@@ -487,6 +503,8 @@ class ColdStartView @JvmOverloads constructor(
         viewColdStartDivider.visibility = View.VISIBLE
         ivColdStartStatus.visibility = View.VISIBLE
         tvColdStartContent.visibility = View.VISIBLE
+        rvNodeList.visibility = View.VISIBLE
+        ivNodeListMask.visibility = View.VISIBLE
         tvColdStartContent.text = "启动中…"
         ivColdStartStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process))
         //开启冷启动连接状态动画
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml
index 4a4e516b6c..cdfd7a10f0 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml
@@ -110,17 +110,6 @@
         android:layout_marginStart="@dimen/dp_15"
         />
 
-    <TextView
-        android:id="@+id/tvColdStartNodeState"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/tvColdStartContent"
-        app:layout_constraintLeft_toLeftOf="@id/tvColdStartContent"
-        android:textSize="@dimen/sp_32"
-        android:textColor="#B2FFFFFF"
-        android:visibility="gone"
-        />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvNodeList"
         android:layout_width="wrap_content"
@@ -131,6 +120,7 @@
         />
 
     <ImageView
+        android:id="@+id/ivNodeListMask"
         android:layout_width="@dimen/dp_0"
         android:layout_height="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="@id/rvNodeList"
@@ -141,17 +131,29 @@
         android:elevation="@dimen/dp_10"
         />
 
+    <TextView
+        android:id="@+id/tvColdStartTip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/tvColdStartNow"
+        android:text="@string/cold_start_now_tip"
+        android:textSize="@dimen/sp_28"
+        android:textColor="#82FFFFFF"
+        android:layout_marginBottom="@dimen/dp_124"
+        />
+
     <TextView
         android:id="@+id/tvColdStartNow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="@id/tvSystemStartupTitle"
-        app:layout_constraintTop_toBottomOf="@id/rvNodeList"
+        app:layout_constraintBottom_toTopOf="@id/tvColdStartTip"
         android:text="@string/cold_start_now"
         android:textSize="@dimen/sp_40"
         android:textColor="@color/white"
         android:gravity="center"
-        android:layout_marginTop="@dimen/dp_154"
+        android:layout_marginBottom="@dimen/dp_16"
         />
 
     <ImageView
@@ -167,16 +169,5 @@
         android:layout_marginTop="@dimen/dp_4"
         />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/tvColdStartNow"
-        app:layout_constraintStart_toStartOf="@id/tvColdStartNow"
-        android:text="@string/cold_start_now_tip"
-        android:textSize="@dimen/sp_28"
-        android:textColor="#82FFFFFF"
-        android:layout_marginTop="@dimen/dp_16"
-        />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file