diff --git a/services/dialog_ui/enable_notification_dialog/AppScope/app.json b/services/dialog_ui/enable_notification_dialog/AppScope/app.json index 796fd930b22b6e3510aae35f6329626385cfe1ff..d7b2858123732b03f59fd76bcb421056f75210d4 100644 --- a/services/dialog_ui/enable_notification_dialog/AppScope/app.json +++ b/services/dialog_ui/enable_notification_dialog/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.notificationdialog", "vendor": "example", - "versionCode": 1000024, - "versionName": "1.2.4", + "versionCode": 1000025, + "versionName": "1.2.5", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true, diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts index 50b63ba2099bcc87339b3f667936deb6fdd9dbe4..dfe0f384511d86a63d304e258bb3de4dec2d1b9b 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts @@ -178,7 +178,9 @@ export class EnableNotificationDialog { let waiteTimes = 0; extensionWindow.on('rectChange', uiExtension.RectChangeReason.HOST_WINDOW_RECT_CHANGE, (data):void => { console.info(TAG, `windowRectChange ts event ${data.rect?.left},${data.rect?.top}, ${data.rect?.width}, ${data.rect?.height}`); - hasDisalogRectInfo = true; + if(data.rect?.width > 0 && data.rect?.height > 0) { + hasDisalogRectInfo = true; + } }); while(!hasDisalogRectInfo && waiteTimes < 10){ waiteTimes ++; @@ -204,6 +206,11 @@ export class EnableNotificationDialog { this.initSubWindowSize = true; } } + try { + await subWindow.setFollowParentWindowLayoutEnabled(true); + } catch (err) { + console.error(TAG, `setFollowParentWindowLayoutEnabled failed! ${err.code} ${err.message}`); + } await subWindow.loadContent(path, this.storage); try { await subWindow.hideNonSystemFloatingWindows(true);