From 393f9fb97833dd563bae7a3e5c902fc93d3f0dbf Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 9 Dec 2024 12:02:32 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]=E5=86=B7=E5=90=AF=E5=8A=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/tools/OTAUpgradeDialog.kt |  3 ++-
 .../core/function/hmi/ui/widget/ColdStartView.kt   | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt
index 984964f7d2..2c61ff5235 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt
@@ -54,7 +54,8 @@ class OTAUpgradeDialog(context: Context) :
             }
 
             override fun onFinish() {
-                CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY)
+                //立即升级
+                CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY)
                 ThreadUtils.runOnUiThread {
                     dismiss()
                 }
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 92baa85d2b..355d803c4b 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
@@ -300,6 +300,14 @@ class ColdStartView @JvmOverloads constructor(
                 Log.i(TAG,"节点自上报冷启动状态="+it.eventStatus)
                 Log.i(TAG,"旧冷启动状态="+it.processStatus)
                 Log.i(TAG,"旧冷启动超时原因="+it.processTimeoutReason)
+                Log.i(TAG,"硬件故障Node数量="+it.hardwareNodeCount)
+                it.hardwareNodeList.forEach {startFlt->
+                    Log.i(TAG,"硬件故障 startFlt.fltId="+ startFlt.fltId)
+                }
+                Log.i(TAG,"其他故障数量="+it.otherFltsCount)
+                it.otherFltsList.forEach {startFlt->
+                    Log.i(TAG,"其他故障 startFlt.fltId="+startFlt.fltId)
+                }
                 ThreadUtils.runOnUiThread {
                     tvColdStartContent.text = getColdStartEventStatus(it.eventStatus)
                     if(it.eventStatus == SsmInfo.CSState.COLD_START_READY){
@@ -327,6 +335,12 @@ class ColdStartView @JvmOverloads constructor(
                             val nodeInfo = ColdStartNodeInfo(node.nodeName,node.eventCode,getColdStartNodeStatus(node.status),node.desc)
                             nodeList.add(nodeInfo)
                         }
+
+                        Log.i(TAG,"nodeName="+node.nodeName+" status="+node.status+" desc="+node.desc+" eventCode="+node.eventCode)
+                        Log.i(TAG,"node.haveFltCount="+node.haveFltCount)
+                        node.haveFltList.forEach {str->
+                            Log.i(TAG, "故障码=$str")
+                        }
                     }
                     it.nodeList.forEach {node->
                         if(node.status == SsmInfo.NodeStatus.NODE_STARTING){