diff --git a/AppScope/app.json5 b/AppScope/app.json5 index b9626ec0b82881515db9379a792e0a17316e2cb0..2d0b59c916b3c5a6c463c4cff3223587e61bae2e 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,8 +3,8 @@ "bundleName": "com.ohos.updateapp", "debug": false, "vendor": "example", - "versionCode": 2040000100, - "versionName": "204.0.0.100", + "versionCode": 2040000105, + "versionName": "204.0.0.105", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/feature/ota/src/main/ets/manager/OtaUpdateManager.ets b/feature/ota/src/main/ets/manager/OtaUpdateManager.ets index 2cf7834ec66adc369bd5c4161de1b0b03728044b..a176b455e68a6a35d0471a339aa9a0a7c8fbf609 100644 --- a/feature/ota/src/main/ets/manager/OtaUpdateManager.ets +++ b/feature/ota/src/main/ets/manager/OtaUpdateManager.ets @@ -369,9 +369,11 @@ export class OtaUpdateManager { public async handleWant(want: Want, context: common.Context): Promise { let action: string = want?.action ?? ''; if (await NotificationManager.handleAction(action, context)) { + this.log('handleWant:' + FormatUtils.stringify(want)); return; } let eventInfo = this.wantParser(want); + 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 0697c260fbfd32066021f580e6d642e7501036e4..ebdd7dda52481967739980cfa6dedb6e84703276 100644 --- a/feature/ota/src/main/ets/manager/StateManager.ets +++ b/feature/ota/src/main/ets/manager/StateManager.ets @@ -422,6 +422,7 @@ export class DownloadSuccess extends BaseState { async notify(context?: common.Context, eventId?: update.EventId): Promise { let isABInstall = await VersionUtils.isABInstall(); + LogUtils.info('StateManager:', 'notify ab flag ' + isABInstall + ',eventId:' + eventId); if (eventId == update.EventId.EVENT_DOWNLOAD_SUCCESS && isABInstall) { OtaUpdateManager.getInstance().upgrade(update.Order.INSTALL); return; diff --git a/product/oh/base/src/main/ets/ServiceExtAbility/service.ts b/product/oh/base/src/main/ets/ServiceExtAbility/service.ts index 6f6a25eefc1246ab0a1ceae63dfe20910751dcce..2171c1154bffe0d6ac6bc510f934fb7a0cd2e2a4 100644 --- a/product/oh/base/src/main/ets/ServiceExtAbility/service.ts +++ b/product/oh/base/src/main/ets/ServiceExtAbility/service.ts @@ -70,10 +70,9 @@ export default class ServiceExtAbility extends Extension { }, this.connectTimeout * 1000); let want: Want = { - parameters: { - parameters: FormatUtils.parseJson(message) - } + parameters: FormatUtils.parseJson(message) }; + LogUtils.log(ServiceExtAbility.TAG, 'onConnect:' + FormatUtils.stringify(want)); OtaUpdateManager.getInstance().handleWant(want, globalThis.extensionContext); }