From f605fe572c67521019de280b3ee6c0715d9c9b87 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 24 Jun 2025 10:57:48 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0=5Fnew=5Fota]OTA2.0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/OTAUpgradeManager.kt | 27 +++++++++++++++++++ .../function/hmi/bone/tab/CarInfoTabView.kt | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) 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 a75f12913e..ae49413cc3 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 @@ -46,6 +46,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, private var responseTimeoutNum: Int = 0 //响应超时次数 private var shouldShowColdStartWindow: Boolean = false //是否需要展示冷启动页面 + private var versionTwoTimeoutNum: Int = 0 //OTA2.0版本响应超时次数 + private val handler =object : Handler(Looper.getMainLooper()){ override fun handleMessage(msg: Message) { super.handleMessage(msg) @@ -68,6 +70,24 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, //司机屏弹窗提示用车人执行车辆下电操作 CallerHmiManager.showOTAPowerOffFinishDialog() shouldShowColdStartWindow = true + }else if(msg.what == 3){ + //OTA2.0超时查询 + if(versionTwoTimeoutNum<40){ + versionTwoTimeoutNum++ + //30秒没有收到OTA升级推送主动进行查询 + Log.i(TAG,"30秒没有收到OTA升级推送主动进行查询") + //查询OTA升级 + val query = JSONObject() + query.put("cmd","PAD_QUERY_UPGRADE_STATUS") + query.put("token",OTAUpgradeConfig.token) + Log.i("xuxinchao",query.toString()) + CallerAutoPilotControlManager.sendOtaPadMsgQuery(query.toString()) + this.sendEmptyMessageDelayed(3,30000) + }else{ + Log.i(TAG,"20分钟没有收到OTA升级推送置为失败") + CallerHmiManager.showOTADownloadStatusDialog(false, emptyList()) + CallerHmiManager.showOTAResultDialog(isShow = true, result = false) + } } } } @@ -458,15 +478,22 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, //升级中 if(cmd == "PAD_UPGRADE_REPORT"){ CallerHmiManager.showOTADownloadStatusDialog(true,otaUpgradeList) + versionTwoTimeoutNum = 0 + handler.removeMessages(3) + handler.sendEmptyMessageDelayed(3,30000) } //升级完成 if(otaStatus == "fail"){ CallerHmiManager.showOTADownloadStatusDialog(false,emptyList()) CallerHmiManager.showOTAResultDialog(isShow = true, result = false) + versionTwoTimeoutNum = 0 + handler.removeMessages(3) } if(otaStatus == "success"){ CallerHmiManager.showOTADownloadStatusDialog(false,emptyList()) CallerHmiManager.showOTAResultDialog(isShow = true, result = true) + versionTwoTimeoutNum = 0 + handler.removeMessages(3) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index 897ed3ca13..b248924d74 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -165,7 +165,7 @@ class CarInfoTabView @JvmOverloads constructor( //查询OTA升级 - val query: JSONObject = JSONObject() + val query = JSONObject() query.put("cmd","PAD_QUERY_UPGRADE_STATUS") query.put("token",OTAUpgradeConfig.token) Log.i("xuxinchao",query.toString())