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"
/>
-
-
+
+
-
-
\ No newline at end of file