From 67c24e27d777c1b30dc9fd400cef3d7a27ab0c9c Mon Sep 17 00:00:00 2001 From: li-li-wang Date: Tue, 4 Mar 2025 15:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=AA=97=E5=92=8C=E5=AD=90=E7=AA=97?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-li-wang --- AppScope/app.json | 4 ++-- AppScope/app.json5 | 4 ++-- .../src/main/ets/SecurityExtAbility/SecurityExtAbility.ts | 5 ++++- permissionmanager/src/main/ets/pages/securityDialog.ets | 1 - 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AppScope/app.json b/AppScope/app.json index ae2906b..cb1e2bf 100644 --- a/AppScope/app.json +++ b/AppScope/app.json @@ -4,8 +4,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000075, - "versionName": "1.7.5", + "versionCode": 1000076, + "versionName": "1.7.6", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 5c5d8f5..fb84c46 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000075, - "versionName": "1.7.5", + "versionCode": 1000076, + "versionName": "1.7.6", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts index d47b4d0..1f0f912 100644 --- a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts +++ b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts @@ -96,7 +96,10 @@ export default class SecurityExtensionAbility extends extension { this.context.terminateSelf(); } }); - if (deviceInfo.deviceType !== 'wearable') { + try { + await win.setFollowParentWindowLayoutEnabled(true); + } catch(error) { + console.error(TAG + `setFollowParentWindowLayoutEnabled error: ${JSON.stringify(error)}`); await win.moveWindowTo(rect.left, rect.top); await win.resize(rect.width, rect.height); }; diff --git a/permissionmanager/src/main/ets/pages/securityDialog.ets b/permissionmanager/src/main/ets/pages/securityDialog.ets index 0255cec..61abd38 100644 --- a/permissionmanager/src/main/ets/pages/securityDialog.ets +++ b/permissionmanager/src/main/ets/pages/securityDialog.ets @@ -297,7 +297,6 @@ struct SecurityDialog { this.context.terminateSelf(); } }, - offset: { dx: 0, dy: 0 - this.want.parameters['ohos.dialog.offset'] + 'px' } }); @Builder -- Gitee