From e2a34313faa61d507849ce917819d4f179ba22a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 14 Aug 2024 21:07:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=88=96=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=8F=90=E9=86=92=20Signed-off-by:=20=E9=82=B9?= =?UTF-8?q?=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/manager/OtaUpdateManager.ets | 3 ++- .../ota/src/main/ets/manager/StateManager.ets | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/feature/ota/src/main/ets/manager/OtaUpdateManager.ets b/feature/ota/src/main/ets/manager/OtaUpdateManager.ets index a176b45..21b0e0e 100644 --- a/feature/ota/src/main/ets/manager/OtaUpdateManager.ets +++ b/feature/ota/src/main/ets/manager/OtaUpdateManager.ets @@ -323,6 +323,7 @@ export class OtaUpdateManager { await this.getNewVersion(); } + this.log('notifyUpdateStatus' + 'notify start'); await StateManager.createInstance(otaStatus).notify(context, eventId); } @@ -373,7 +374,7 @@ export class OtaUpdateManager { return; } let eventInfo = this.wantParser(want); - this.log('handleWant:' + ' eventInfo is ${FormatUtils.stringify(eventInfo)}'); + this.log('handleWant: eventInfo is ' + FormatUtils.stringify(eventInfo)); if (!eventInfo?.eventId) { this.log('eventInfo?.eventId is null'); return; diff --git a/feature/ota/src/main/ets/manager/StateManager.ets b/feature/ota/src/main/ets/manager/StateManager.ets index ebdd7dd..2249056 100644 --- a/feature/ota/src/main/ets/manager/StateManager.ets +++ b/feature/ota/src/main/ets/manager/StateManager.ets @@ -577,12 +577,17 @@ export class UpgradeSuccess extends BaseState { this.isButtonClickable = false; } - async notify(context?: common.Context): Promise { - AppStorage.Set('installStatusRefresh', JSON.stringify(this.otaStatus)); - await UpgradeAdapter.getInstance().getNotifyInstance()?.cancelAll(); - let versionName = globalThis.lastVersionName; - LogUtils.log('StateManager', 'UpgradeSuccess versionName is ' + versionName); - await UpgradeAdapter.getInstance().getNotifyInstance()?.showUpgradeSuccess(versionName, context); + async notify(context?: common.Context, eventId?: update.EventId): Promise { + if (eventId == update.EventId.EVENT_UPGRADE_SUCCESS) { + LogUtils.log('StateManager', 'Upgrade success'); + AppStorage.Set('installStatusRefresh', JSON.stringify(this.otaStatus)); + await UpgradeAdapter.getInstance().getNotifyInstance()?.cancelAll(); + let versionName = globalThis.lastVersionName; + LogUtils.log('StateManager', 'UpgradeSuccess versionName is ' + versionName); + await UpgradeAdapter.getInstance().getNotifyInstance()?.showUpgradeSuccess(versionName, context); + } else { + LogUtils.log('StateManager', 'Upgrade EventId error'); + } } } -- Gitee From e59761e1f4f05b6c64253dca8dc3179a4350c6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 14 Aug 2024 13:27:59 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- feature/ota/src/main/ets/manager/StateManager.ets | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/feature/ota/src/main/ets/manager/StateManager.ets b/feature/ota/src/main/ets/manager/StateManager.ets index 2249056..3dc3674 100644 --- a/feature/ota/src/main/ets/manager/StateManager.ets +++ b/feature/ota/src/main/ets/manager/StateManager.ets @@ -579,14 +579,13 @@ export class UpgradeSuccess extends BaseState { async notify(context?: common.Context, eventId?: update.EventId): Promise { if (eventId == update.EventId.EVENT_UPGRADE_SUCCESS) { - LogUtils.log('StateManager', 'Upgrade success'); AppStorage.Set('installStatusRefresh', JSON.stringify(this.otaStatus)); await UpgradeAdapter.getInstance().getNotifyInstance()?.cancelAll(); let versionName = globalThis.lastVersionName; - LogUtils.log('StateManager', 'UpgradeSuccess versionName is ' + versionName); + LogUtils.info('StateManager', 'UpgradeSuccess versionName is ' + versionName); await UpgradeAdapter.getInstance().getNotifyInstance()?.showUpgradeSuccess(versionName, context); } else { - LogUtils.log('StateManager', 'Upgrade EventId error'); + LogUtils.error('StateManager', 'Upgrade EventId error'); } } } -- Gitee