yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.1.0_new_ota]OTA2.0修改

Browse Source
This commit is contained in:
xuxinchao
2025-06-24 15:32:29 +08:00
parent 3f20a6a9f2
commit 9dd0222547
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt
View File

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

2
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -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());
}
/**