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 @@