From 9dd0222547dc6f243559556bc49180ae527f798c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 24 Jun 2025 15:32:29 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0=5Fnew=5Fota]OTA2.0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/OTAUpgradeManager.kt | 51 +++++++++---------- .../zhidao/support/adas/high/AdasChannel.java | 2 +- 2 files changed, 25 insertions(+), 28 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 ff6696e990..6ec9755f15 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 @@ -481,35 +481,32 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, //请求升级 if(cmd == "ASK_PAD_UPGRADE" && otaStatus == "init"){ - if(!OTAUpgradeConfig.promptedUpgradeTwo.contains(otaToken)){ - //冷启动已完成（包括成功/失败），且驾驶状态为非自驾状态，且当前无订单进行强提示，否则为弱提示 - if(OTAUpgradeConfig.coldStartCompleted && !OTAUpgradeConfig.autopilotStatus - && !OTAUpgradeConfig.inOrder){ - //触发强提示升级 - CallerHmiManager.showOTAUpgradeDialog(true,upgradeReason) + //冷启动已完成（包括成功/失败），且驾驶状态为非自驾状态，且当前无订单进行强提示，否则为弱提示 + if(OTAUpgradeConfig.coldStartCompleted && !OTAUpgradeConfig.autopilotStatus + && !OTAUpgradeConfig.inOrder){ + //触发强提示升级 + CallerHmiManager.showOTAUpgradeDialog(true,upgradeReason) + }else{ + //触发弱提示升级 + //冷启动未完成（进行中），或驾驶状态为自驾状态，或当前有订单，直接默认选择稍后升级， + // 并toast提示“收到车辆部署任务，请在车辆空闲时发起升级” + + val reason = if(OTAUpgradeConfig.autopilotStatus){ + "处于自驾中" + }else if(OTAUpgradeConfig.inOrder){ + "处于订单中" }else{ - //触发弱提示升级 - //冷启动未完成（进行中），或驾驶状态为自驾状态，或当前有订单，直接默认选择稍后升级， - // 并toast提示“收到车辆部署任务，请在车辆空闲时发起升级” - - val reason = if(OTAUpgradeConfig.autopilotStatus){ - "处于自驾中" - }else if(OTAUpgradeConfig.inOrder){ - "处于订单中" - }else{ - "冷启动未完成" - } - val query = JSONObject() - query.put("cmd","ASK_PAD_UPGRADE_RES") - query.put("token",OTAUpgradeConfig.token) - query.put("allow_upgrade",false) - query.put("reason",reason) - Log.i("xuxinchao",query.toString()) - CallerAutoPilotControlManager.sendOtaPadMsgQuery(query.toString()) - - ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") + "冷启动未完成" } - OTAUpgradeConfig.promptedUpgradeTwo.add(otaToken) + val query = JSONObject() + query.put("cmd","ASK_PAD_UPGRADE_RES") + query.put("token",OTAUpgradeConfig.token) + query.put("allow_upgrade",false) + query.put("reason",reason) + Log.i("xuxinchao",query.toString()) + CallerAutoPilotControlManager.sendOtaPadMsgQuery(query.toString()) + + ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") } return } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 7529bc3dd8..593665dfb9 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -3112,7 +3112,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec public long sendOtaPadMsgQuery(@Nullable String queryStr) { SsmInfo.PureStr.Builder builder = SsmInfo.PureStr.newBuilder(); builder.setData(TextUtils.isEmpty(queryStr) ? "" : queryStr); - return sendSsmFuncMsg(true,system_master.SsmInfo.MessageType.OTA_PAD_MSG,builder.build().toByteString()); + return sendSsmFuncMsg(false,system_master.SsmInfo.MessageType.OTA_PAD_MSG,builder.build().toByteString()); } /**