diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index e5824a8c58..35f34a1d8f 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -446,24 +446,24 @@ class MoGoAdasListenerImpl : OnAdasListener { } } - /** - * SSM上报OTA下载进度, 开始升级后定频上报 - * - * @param header 头 - * @param token PadSsmMsg唯一消息ID - * @param timestamp 消息发送时间 单位：毫秒 - * @param progress 数据 null表示 PadSsmMsg中的消息体为null - */ - override fun onOtaLoadingProgress( - header: MessagePad.Header?, - token: Long, - timestamp: Long, - progress: SsmInfo.OtaLoadingProgess? - ) { - if(progress != null){ - CallerOTAManager.invokeOtaLoadingProgress(progress) - } - } +// /** +// * SSM上报OTA下载进度, 开始升级后定频上报 +// * +// * @param header 头 +// * @param token PadSsmMsg唯一消息ID +// * @param timestamp 消息发送时间 单位：毫秒 +// * @param progress 数据 null表示 PadSsmMsg中的消息体为null +// */ +// override fun onOtaLoadingProgress( +// header: MessagePad.Header?, +// token: Long, +// timestamp: Long, +// progress: SsmInfo.OtaLoadingProgess? +// ) { +// if(progress != null){ +// CallerOTAManager.invokeOtaLoadingProgress(progress) +// } +// } /** * SSM上报OTA状态和查询OTA状态 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 774bc35424..335fd6ff17 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 @@ -56,15 +56,6 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, } - /** - * SSM上报OTA下载进度, 开始升级后定频上报 - * @param progress 下载进度 - */ - override fun onOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess) { - super.onOtaLoadingProgress(progress) - - - } /** * SSM上报OTA状态和查询OTA状态 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IOTAListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IOTAListener.kt index d200779363..6068c69827 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IOTAListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IOTAListener.kt @@ -13,11 +13,11 @@ interface IOTAListener { */ fun onOtaDownloadRequest(request: SsmInfo.OtaDownloadRequest){} - /** - * SSM上报OTA下载进度, 开始升级后定频上报 - * @param progress 下载进度 - */ - fun onOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess){} +// /** +// * SSM上报OTA下载进度, 开始升级后定频上报 +// * @param progress 下载进度 +// */ +// fun onOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess){} /** * SSM上报OTA状态和查询OTA状态 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerOTAManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerOTAManager.kt index dcb60a0a47..1397424207 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerOTAManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerOTAManager.kt @@ -20,16 +20,16 @@ object CallerOTAManager: CallerBase() { } } - /** - * SSM上报OTA下载进度, 开始升级后定频上报 - * @param progress 下载进度 - */ - fun invokeOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess){ - M_LISTENERS.forEach { - val listener = it.value - listener.onOtaLoadingProgress(progress) - } - } +// /** +// * SSM上报OTA下载进度, 开始升级后定频上报 +// * @param progress 下载进度 +// */ +// fun invokeOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess){ +// M_LISTENERS.forEach { +// val listener = it.value +// listener.onOtaLoadingProgress(progress) +// } +// } /** * SSM上报OTA状态和查询OTA状态 diff --git a/libraries/mogo-adas-data/src/main/proto/ssm_info.proto b/libraries/mogo-adas-data/src/main/proto/ssm_info.proto index 7e738f60d2..a9cfd92b3e 100644 --- a/libraries/mogo-adas-data/src/main/proto/ssm_info.proto +++ b/libraries/mogo-adas-data/src/main/proto/ssm_info.proto @@ -58,7 +58,7 @@ enum MessageType { NOTIFICATION = 0; // ssm发送通知 msg:Notification OTA_DOWNLOAD_REQUEST = 1; // ssm发送OTA升级提示请求 todo OTA_DOWNLOAD_RESPONSE = 2; // pad下发OTA升级提示响应 todo - OTA_LOADING_PROGRESS = 3; // ssm上报OTA下载进度, 开始升级后定频上报 todo + OTA_LOADING_PROGRESS = 3; // ssm上报OTA下载进度, 开始升级后定频上报 todo 废弃 使用OTA_STATUS 定频推送的进度来，为下载时是0.1Hz，下载时是1Hz，此接口无法表示多任务，所以废弃 OTA_STATUS = 4; // ssm 上报OTA状态 todo OTA_STATUS_QUERY = 5; // pad查询OTA状态 req:OtaToken resp:OtaStatus COLD_START_STATUS_REPORT = 6; // 冷启动状态上报 msg:ColdStartState @@ -91,13 +91,41 @@ enum OtaType { MAP = 3; PROFILE = 4; } +//product_name中的数据 +//[{ +// "token": "12,34,56", +// "status": 0,// 与 UpgradeStatus 中的值相同 +// "fail_reason": "", +// "upgrade_reason": "", +// "task_id": 0, +// "task_item_id": 0, +// "ota_type": 1, +// "product_name": "", +// "need_restart": false, +// "is_delay": false, +// "cur_size": 0, +// "total_size": 0 +//}, { +// "token": "34,56,78", +// "status": 0, +// "fail_reason": "", +// "upgrade_reason": "", +// "task_id": 0, +// "task_item_id": 0, +// "ota_type": 1, +// "product_name": "", +// "need_restart": false, +// "is_delay": false, +// "cur_size": 0, +// "total_size": 0 +//}] message OtaDownloadRequest { required string ota_token = 1; // ota token 唯一标识 - required OtaType ota_type = 2; // ota type 1:镜像, 2:固件, 3:地图, 4:配置文件 - required bool need_restart = 3; // 是否需要重启 True:需要, False:不需要 + required OtaType ota_type = 2; // ota type 1:镜像, 2:固件, 3:地图, 4:配置文件 todo 废弃，使用product_name json中的 ota_type + required bool need_restart = 3; // 是否需要重启 True:需要, False:不需要 todo 废弃，使用product_name json中的 need_restart required string product_name = 4; // 制品名称 - optional double size = 5; // 文件大小 Mb + optional double size = 5; // 文件大小 Mb todo 废弃，使用product_name json中的 cur_size total_size } enum IfUpgrade { @@ -130,8 +158,8 @@ enum UpgradeStatus { message OtaStatus { required OtaDownloadRequest ota_info = 1; // 升级信息 - required UpgradeStatus status = 2; // 状态 0:默认(未开始), 1:下载中, 2:下载完成, 3:升级完成, 4:升级失败 - optional string reason = 3; // 失败原因 + required UpgradeStatus status = 2; // 状态 0:默认(未开始), 1:下载中, 2:下载完成, 3:升级完成, 4:升级失败 todo 废弃，使用product_name json中的 status + optional string reason = 3; // 失败原因 todo 废弃 todo 废弃，使用product_name json中的 fail_reason } enum CSState { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java index 2692687c37..2408c9c74a 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java @@ -217,15 +217,15 @@ public interface OnAdasListener { */ void onOtaDownloadRequest(MessagePad.Header header, long token, long timestamp, @Nullable SsmInfo.OtaDownloadRequest request); - /** - * SSM上报OTA下载进度, 开始升级后定频上报 - * - * @param header 头 - * @param token PadSsmMsg唯一消息ID - * @param timestamp 消息发送时间 单位：毫秒 - * @param progress 数据 null表示 PadSsmMsg中的消息体为null - */ - void onOtaLoadingProgress(MessagePad.Header header, long token, long timestamp, @Nullable SsmInfo.OtaLoadingProgess progress); +// /** +// * SSM上报OTA下载进度, 开始升级后定频上报 +// * +// * @param header 头 +// * @param token PadSsmMsg唯一消息ID +// * @param timestamp 消息发送时间 单位：毫秒 +// * @param progress 数据 null表示 PadSsmMsg中的消息体为null +// */ +// void onOtaLoadingProgress(MessagePad.Header header, long token, long timestamp, @Nullable SsmInfo.OtaLoadingProgess progress); /** diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java index 34d57d25e7..8cd2db31d5 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java @@ -63,14 +63,14 @@ public class PadSsmFuncMsgMessage extends MyAbstractMessageHandler { adasListener.onOtaDownloadRequest(raw.getHeader(), padSsmMsg.getToken(), timestamp, request); } } else if (type == SsmInfo.MessageType.OTA_LOADING_PROGRESS) { - //SSM上报OTA下载进度, 开始升级后定频上报 - SsmInfo.OtaLoadingProgess progress = null; - if (!data.isEmpty()) { - progress = SsmInfo.OtaLoadingProgess.parseFrom(data); - } - if (adasListener != null) { - adasListener.onOtaLoadingProgress(raw.getHeader(), padSsmMsg.getToken(), timestamp, progress); - } +// //SSM上报OTA下载进度, 开始升级后定频上报 +// SsmInfo.OtaLoadingProgess progress = null; +// if (!data.isEmpty()) { +// progress = SsmInfo.OtaLoadingProgess.parseFrom(data); +// } +// if (adasListener != null) { +// adasListener.onOtaLoadingProgress(raw.getHeader(), padSsmMsg.getToken(), timestamp, progress); +// } } else if (type == SsmInfo.MessageType.OTA_STATUS || type == SsmInfo.MessageType.OTA_STATUS_QUERY) { //SSM上报OTA状态和查询OTA状态 SsmInfo.OtaStatus status = null;