From 9ea2333857e571d13165d2d39c2497a1b5b485d1 Mon Sep 17 00:00:00 2001 From: li-li-wang Date: Sun, 18 May 2025 17:41:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?setSystemAvoidAreaEnabled=20=E6=A3=80?= =?UTF-8?q?=E6=9F=A5-rk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-li-wang --- .../src/main/ets/SecurityExtAbility/SecurityExtAbility.ts | 8 ++++++-- permissionmanager/src/main/ets/pages/securityToast.ets | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts index b8d9d64..6435e72 100644 --- a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts +++ b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts @@ -54,7 +54,7 @@ export default class SecurityExtensionAbility extends extension { height: height }; let notifyType = want.parameters['ohos.ability.notify.type'] ?? 0; - if (notifyType === NotifyType.Toast) { + if (true) { try { startId > 1 && window.findWindow(`SaveButtonTip${startId - 1}`).destroyWindow(); } catch (exception) { @@ -135,7 +135,11 @@ export default class SecurityExtensionAbility extends extension { let storage: LocalStorage = new LocalStorage(property); await win.moveWindowTo(rect.left, rect.top); await win.resize(rect.width, rect.height); - await win.setSystemAvoidAreaEnabled(true); + try { + await win.setSystemAvoidAreaEnabled(true); + } catch (error) { + console.error(TAG + `setSystemAvoidAreaEnabled error: ${JSON.stringify(error)}.`); + }; await win.loadContent('pages/securityToast', storage); win.setWindowBackgroundColor(BG_COLOR); await win.setWindowTouchable(false); diff --git a/permissionmanager/src/main/ets/pages/securityToast.ets b/permissionmanager/src/main/ets/pages/securityToast.ets index 7d0d99d..beec8a3 100644 --- a/permissionmanager/src/main/ets/pages/securityToast.ets +++ b/permissionmanager/src/main/ets/pages/securityToast.ets @@ -67,7 +67,7 @@ struct SecurityToast { Log.info('onAboutToAppear'); this.rotationInit = display.getDefaultDisplaySync().orientation; this.densityDPIInit = display.getDefaultDisplaySync().densityDPI; - this.setPosition = this.want.parameters['ohos.toast.position'] ?? false; + this.setPosition = this.want.parameters['ohos.toast.position'] ?? true; this.positionY = this.setPosition ? Constants.TOAST_POSITION_Y_UP : Constants.TOAST_POSITION_Y_UNDER; this.setOffset = this.want.parameters['ohos.toast.offset'] ?? Constants.TOAST_ANIMATION_OFFSET; this.screenMonitor(); -- Gitee From df0caec74e18093eb8c49a57d371e4ba1a9932cf Mon Sep 17 00:00:00 2001 From: li-li-wang Date: Mon, 19 May 2025 15:52:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E8=80=81=E5=8C=96=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-li-wang --- permissionmanager/src/main/ets/common/utils/constant.ets | 2 +- permissionmanager/src/main/ets/pages/securityToast.ets | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index aa08e9d..970306d 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -352,7 +352,7 @@ export default class Constants { public static CUSTOMIZE_BUTTON_TEXT_MAX_SIZE = 15; // SecurityToast - public static TOAST_SYMBOLGLYPH_FONTSIZE = 16; + public static TOAST_SYMBOLGLYPH_FONTSIZE = '16vp'; public static TOAST_POSITION_Y_UP = 15; public static TOAST_POSITION_Y_UNDER = -15; public static TOAST_ANIMATION_OFFSET = 80; diff --git a/permissionmanager/src/main/ets/pages/securityToast.ets b/permissionmanager/src/main/ets/pages/securityToast.ets index beec8a3..c486fad 100644 --- a/permissionmanager/src/main/ets/pages/securityToast.ets +++ b/permissionmanager/src/main/ets/pages/securityToast.ets @@ -131,16 +131,12 @@ struct SecurityToast { Column() { Flex({ alignItems: ItemAlign.Center }) { SymbolGlyph($r('sys.symbol.security_shield')) - .maxFontScale(Constants.TOAST_MAX_FONT_SCALE) - .minFontScale(Constants.TOAST_MAX_FONT_SCALE) .fontSize(Constants.TOAST_SYMBOLGLYPH_FONTSIZE) .fontColor([$r('sys.color.icon_primary'), $r('sys.color.icon_emphasize')]) .renderingStrategy(SymbolRenderingStrategy.MULTIPLE_COLOR) Blank() .width('4vp') Text($r('app.string.SecurityTitle_mediaFiles')) - .maxFontScale(Constants.TOAST_MAX_FONT_SCALE) - .minFontScale(Constants.TOAST_MAX_FONT_SCALE) .fontSize($r('sys.float.Body_M')) .fontColor($r('sys.color.font_primary')) .onAppear(() => { -- Gitee