From 75f38b4dedc585dfb77525beaa5cf6493653db2a Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Fri, 25 Nov 2022 19:52:16 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20a066c93=20from=20https://gitee.com/tz?= =?UTF-8?q?=5Flws/applications=5Fpermission=5Fmanager/pulls/59=20=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=9C=BA=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- permissionmanager/src/main/ets/common/components/dialog.ets | 3 ++- permissionmanager/src/main/ets/common/utils/constant.ets | 1 + permissionmanager/src/main/ets/pages/dialogPlus.ets | 3 ++- permissionmanager/src/main/ets/pages/globalSwitch.ets | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 7491db0..2963969 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -56,7 +56,8 @@ export struct globalDialog { controller: CustomDialogController; build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: ((deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE) + || (deviceInfo.deviceType == Constants.PHONE_DEVICE_TYPE)) ? ItemAlign.End : ItemAlign.Center }) { Column() { Text(globalThis.currentPermissionGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index cb0bada..6b60e44 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -284,6 +284,7 @@ export default class Constants { static BUNDLE_NAME = 'com.ohos.permissionmanager' static DEFAULT_DEVICE_TYPE = 'default' + static PHONE_DEVICE_TYPE = 'phone' static TABLET_DEVICE_TYPE = 'tablet' static PERMISSION_DIALOG_MARGIN_BOTTOM = 62 diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index 1b3b2e0..c183803 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -72,7 +72,8 @@ struct PermissionDialog { controller: CustomDialogController build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: ((deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE) + || (deviceInfo.deviceType == Constants.PHONE_DEVICE_TYPE)) ? ItemAlign.End : ItemAlign.Center }) { Column() { if ((this.initStatus != Constants.INIT_NEED_TO_WAIT) && this.verify()) { Image(this.grantGroups[this.count].icon) diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 879316c..dcc6f03 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -54,7 +54,8 @@ struct globalDialog { controller: CustomDialogController build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: ((deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE) + || (deviceInfo.deviceType == Constants.PHONE_DEVICE_TYPE)) ? ItemAlign.End : ItemAlign.Center }) { Column() { Text(globalThis.globalState == MICROPHONE ? $r('app.string.global_title_microphone') : globalThis.globalState == CAMERA ? $r('app.string.global_title_camera') : -- Gitee