diff --git a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts index b8d9d64c17411ba47fcb92e4357a9c5d9187ea23..6435e72b27135c2494cf4031098483cfaac289a9 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/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index aa08e9db774d35be1032731884cc6b0a6aa445fc..970306d69cc48f2ea6a31e94aff81785c700d1c7 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 7d0d99d5517eb69a2707f79fe6927e9ad3f42230..c486fad8a0d4780bd7d78f7ed1d344ceb90804f1 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(); @@ -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(() => {