From 5221bda15b684cd2f78061cea40cdb4fda56fe20 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 3 Dec 2024 16:52:36 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0]OTA=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/OTAUpgradeManager.kt | 12 +++++++++++ .../data/deva/coldstart/ColdStartNodeInfo.kt | 2 -- .../core/data/deva/ota/OtaUpgradeInfo.kt | 20 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/ota/OtaUpgradeInfo.kt 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 335fd6ff17..62bf7c730c 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 @@ -1,6 +1,7 @@ package com.zhjt.mogo_core_function_devatools.ota import android.content.Context +import android.util.Log import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener import com.mogo.eagle.core.function.api.devatools.IOTAListener @@ -8,6 +9,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener import com.mogo.eagle.core.function.call.devatools.CallerOTAManager +import org.json.JSONArray import system_master.SsmInfo /** @@ -67,6 +69,16 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, override fun onOtaStatus(status: SsmInfo.OtaStatus) { super.onOtaStatus(status) OTAUpgradeConfig.otaToken = status.otaInfo.otaToken + + Log.i(TAG,"status.otaInfo.otaToken"+status.otaInfo.otaToken) + Log.i(TAG,"status.otaInfo.productName"+status.otaInfo.productName) + + //解析JSON + val productArray = JSONArray(status.otaInfo.productName) + if(productArray.length() > 0){ + + } + } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/coldstart/ColdStartNodeInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/coldstart/ColdStartNodeInfo.kt index a6855aa921..b30aa2421a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/coldstart/ColdStartNodeInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/coldstart/ColdStartNodeInfo.kt @@ -1,7 +1,5 @@ package com.mogo.eagle.core.data.deva.coldstart -import android.os.CountDownTimer - /** * 冷启动关键节点实体类 * @param nodeName 节点名称 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/ota/OtaUpgradeInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/ota/OtaUpgradeInfo.kt new file mode 100644 index 0000000000..570543a0cf --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/ota/OtaUpgradeInfo.kt @@ -0,0 +1,20 @@ +package com.mogo.eagle.core.data.deva.ota + +/** + * OTA升级详情 + * @param token + * @param status + * @param fail_reason + * @param upgrade_reason 升级原因 + * @param task_id + * @param task_item_id + * @param ota_type ota type 1:镜像, 2:固件, 3:地图, 4:配置文件 + * @param product_name 升级项目名称 + * @param need_restart 升级是否需要重启 + * @param is_delay 是否是延时升级 + * @param cur_size 当前已下载文件大小 + * @param total_size 下载文件总大小 + */ +data class OtaUpgradeInfo(var token: String,var status: Int,var fail_reason: String,var upgrade_reason: String, + var task_id: Int,var task_item_id: Int,var ota_type: Int,var product_name: String, + var need_restart: Boolean,var is_delay: Boolean,var cur_size:Float,var total_size: Float) \ No newline at end of file