diff --git a/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp b/services/firmware/upgrade/executor/src/firmware_apply_executor.cpp index b8aa6c9e91f4003bede837f7e9b7258b13c86da4..902fe5957ec566db02922fc3609a5cb15a024d44 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 5adfaab2e7588e7d7d1f55aa18da13fc64261ff6..87a2a2890f91a238970d2ed68df3951473998ddf 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 374c65debe15dc4cb1f515faad16bbd6d6ebfc6c..c5f7bfe52d41bf112a73aa36c4c114416c30a77e 100644 --- a/services/firmware/upgrade/flow/src/firmware_manager.cpp +++ b/services/firmware/upgrade/flow/src/firmware_manager.cpp @@ -310,6 +310,12 @@ void FirmwareManager::HandleBootComplete() HandleBootUpdateOnStatusProcess(task); return; } + + // ab 升级安装完成 + if (task.status == UpgradeStatus::INSTALL_SUCCESS) { + HandleBootUpdateSuccess(task); + return; + } } void FirmwareManager::HandleNetChanged() @@ -357,7 +363,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); @@ -367,8 +373,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;