diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 7491db0d6354f0560d4d26507a78e831edc49e26..2963969d65e2bea74c9f4f280b38a26074259059 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 cb0bada647b6f68c0e332786f2140e1de07f4110..6b60e44c9d8a598089f218ca0d3ca016cf111bb0 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 1b3b2e0101360bdff3774aa65c55bff6e5e9d07e..c18380359dc3faea2699ff74e1eef3615e8db641 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 879316c0a745da7bfbf8d9dbe71b4b8f1e6550c5..dcc6f0313c249b8d29b29b5630a46fc6c0017ec8 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') :