From 855a9a4f056ad20aeaa66c9bfd56e65fe63279cd Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 7 Jan 2025 18:21:42 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]=E8=B0=83=E6=95=B4=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=AD=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/OTAUpgradeManager.kt                         | 12 +++++++++---
 .../src/main/res/layout/item_ota_download_status.xml |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt
index 44e5938001..32bc8bd878 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt
@@ -92,7 +92,7 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener,
                 val taskId = productInfo.optInt("task_id")
                 val taskItemId = productInfo.optInt("task_item_id")
                 val otaType = productInfo.optInt("ota_type")
-                val productName = productInfo.optString("product_name")
+                var productName = productInfo.optString("product_name")
                 val needRestart = productInfo.optBoolean("need_restart")
                 val isDelay = productInfo.optBoolean("is_delay")
                 val curSize = productInfo.optDouble("cur_size")
@@ -131,10 +131,13 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener,
                     }
                 }
 
-                //// 状态 0:默认(未开始), 1:下载中, 2:下载完成, 3:升级完成, 4:升级失败
+                // 状态 0:默认(未开始), 1:下载中, 2:下载完成, 3:升级完成, 4:升级失败
                 if(productStatus == 0 || productStatus == 1 || productStatus == 2){
                     upgradeComplete = false
                 }
+                if(productName.contains(":")){
+                    productName = productName.trim().substringAfterLast(":")
+                }
                 val otaUpgradeInfo = OtaUpgradeInfo(token, productStatus,failReason,upgradeReason,
                 taskId,taskItemId,otaType,productName,needRestart,isDelay,curSize,totalSize)
                 otaUpgradeList.add(otaUpgradeInfo)
@@ -184,7 +187,7 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener,
                 val taskId = productInfo.optInt("task_id")
                 val taskItemId = productInfo.optInt("task_item_id")
                 val otaType = productInfo.optInt("ota_type")
-                val productName = productInfo.optString("product_name")
+                var productName = productInfo.optString("product_name")
                 val needRestart = productInfo.optBoolean("need_restart")
                 val isDelay = productInfo.optBoolean("is_delay")
                 val curSize = productInfo.optDouble("cur_size")
@@ -231,6 +234,9 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener,
                 if(productStatus == 4){
                     upgradeResult = false
                 }
+                if(productName.contains(":")){
+                    productName = productName.trim().substringAfterLast(":")
+                }
                 val otaUpgradeInfo = OtaUpgradeInfo(token, productStatus,failReason,upgradeReason,
                     taskId,taskItemId,otaType,productName,needRestart,isDelay,curSize,totalSize)
                 otaUpgradeList.add(otaUpgradeInfo)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
index d733c8ecb6..cea7004e5e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/tvProductName"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/dp_600"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@id/pbDownloadProgress"
         app:layout_constraintLeft_toLeftOf="@id/pbDownloadProgress"