From 2fcd8521f3ced196ec4a4d09322e8394c0b94308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 8 Jan 2025 08:46:25 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ab=E5=8D=87=E7=BA=A7=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E9=80=9A=E7=9F=A5=E6=A0=8F=E6=8F=90=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- .../upgrade/executor/src/firmware_apply_executor.cpp | 2 -- .../firmware/upgrade/flow/include/firmware_manager.h | 2 +- .../firmware/upgrade/flow/src/firmware_manager.cpp | 11 ++++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp b/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp index b8aa6c9e..902fe595 100644 --- a/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp +++ b/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp @@ -50,8 +50,6 @@ void FirmwareApplyExecutor::DoInstall() firmwareApplyCallback_.applyCallback(false); return; } - GetTask(); - FirmwareTaskOperator().UpdateProgressByTaskId(tasks_.taskId, UpgradeStatus::UPDATING, 0); sleep(Firmware::SLEEP_TIME_BEFORE_REBOOT); DoReboot(NULL); // ab apply } diff --git a/services/firmware/upgrade/flow/include/firmware_manager.h b/services/firmware/upgrade/flow/include/firmware_manager.h index 5adfaab2..87a2a289 100644 --- a/services/firmware/upgrade/flow/include/firmware_manager.h +++ b/services/firmware/upgrade/flow/include/firmware_manager.h @@ -63,7 +63,7 @@ private: void HandleBootDownloadOnStatusProcess(FirmwareTask &task); void HandleBootDownloadPauseStatusProcess(FirmwareTask &task); void HandleBootDownloadedStatusProcess(FirmwareTask &task); - void HandleBootUpdateSuccess(const FirmwareTask &task, const std::map &resultMap); + void HandleBootUpdateSuccess(const FirmwareTask &task); void HandleBootUpdateFail(const FirmwareTask &task, const std::map &resultMap); void DoAutoDownload(const FirmwareTask &task); diff --git a/services/firmware/upgrade/flow/src/firmware_manager.cpp b/services/firmware/upgrade/flow/src/firmware_manager.cpp index 81debf52..5a8c84f7 100644 --- a/services/firmware/upgrade/flow/src/firmware_manager.cpp +++ b/services/firmware/upgrade/flow/src/firmware_manager.cpp @@ -311,6 +311,12 @@ void FirmwareManager::HandleBootComplete() HandleBootUpdateOnStatusProcess(task); return; } + + // ab 升级安装完成 + if (task.status == UpgradeStatus::INSTALL_SUCCESS) { + HandleBootUpdateSuccess(task); + return; + } } void FirmwareManager::HandleNetChanged() @@ -358,7 +364,7 @@ void FirmwareManager::HandleBootUpdateOnStatusProcess(const FirmwareTask &task) FirmwareComponentOperator().QueryAll(components); switch (resultProcess.GetUpdaterResult(components, resultMap)) { case UpdateResultCode::SUCCESS: - HandleBootUpdateSuccess(task, resultMap); + HandleBootUpdateSuccess(task); break; case UpdateResultCode::FAILURE: HandleBootUpdateFail(task, resultMap); @@ -368,8 +374,7 @@ void FirmwareManager::HandleBootUpdateOnStatusProcess(const FirmwareTask &task) } } -void FirmwareManager::HandleBootUpdateSuccess(const FirmwareTask &task, - const std::map &resultMap) +void FirmwareManager::HandleBootUpdateSuccess(const FirmwareTask &task) { preferencesUtil_->SaveString(Firmware::UPDATE_ACTION, "upgrade"); std::vector components; -- Gitee