diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 4115af952732d4df1c9720d67acd37814902f186..9f27f6ad511ab274463af9dc6858c51252c6a538 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 961600721dc8160e5fa1537ed9c00d94b0576663..7d6f2b49407ea5d24ef47f9f7d40f1c7b52de57d 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -271,6 +271,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 83451e3505f8e90c969f05cdd024ee60b1d3be0b..24c4cb0f2984ae286f511fc3097df21488bd7460 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 3aeb2529222ddfe0de52c721708bc0ec16c034d2..39c69cd72aa287e605403f4983ef44436f4d72f7 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') :