From f43784765d916e3274e0fe5591a063ead67c96ec Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Tue, 11 Feb 2025 14:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=97=8F=E6=96=87=E8=A1=8C=E9=AB=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- permissionmanager/src/main/ets/common/utils/utils.ets | 9 ++++++++- permissionmanager/src/main/ets/pages/securityDialog.ets | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/permissionmanager/src/main/ets/common/utils/utils.ets b/permissionmanager/src/main/ets/common/utils/utils.ets index 0127e97..3cfd654 100644 --- a/permissionmanager/src/main/ets/common/utils/utils.ets +++ b/permissionmanager/src/main/ets/common/utils/utils.ets @@ -34,7 +34,8 @@ import window from '@ohos.window'; import { deviceInfo } from '@kit.BasicServicesKit'; import { GlobalContext } from './globalContext'; -const TAG = 'PermissionManager_Log ' +const TAG = 'PermissionManager_Log '; +const TIBETAN_LANGUAGE: string[] = ['bo']; /** * verify permission @@ -293,6 +294,12 @@ export function supportPermission(): Permission[] { return supportGroup; } +export function isTibetanLanguage(): boolean { + let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); + Log.info(`isTibetanLanguage: ${locale}`); + return TIBETAN_LANGUAGE.includes(locale); +} + export class Log { public static domain: number = 0x8214; public static tag: string = 'PermissionManager_Log'; diff --git a/permissionmanager/src/main/ets/pages/securityDialog.ets b/permissionmanager/src/main/ets/pages/securityDialog.ets index aef3904..6b512df 100644 --- a/permissionmanager/src/main/ets/pages/securityDialog.ets +++ b/permissionmanager/src/main/ets/pages/securityDialog.ets @@ -19,7 +19,7 @@ import window from '@ohos.window'; import common from '@ohos.app.ability.common'; import { BusinessError } from '@ohos.base'; import { CustomContentDialog } from '@ohos.arkui.advanced.Dialog'; -import { Log, getFontSizeScale } from '../common/utils/utils'; +import { Log, getFontSizeScale, isTibetanLanguage } from '../common/utils/utils'; import { Param, WantInfo, DialogInfo } from '../common/model/typedef'; import { GlobalContext } from '../common/utils/globalContext'; import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; @@ -140,6 +140,7 @@ function dialogContentsArea(params: DialogInfo) { .fontColor(params.isWearable ? '#A8FFFFFF' : $r('sys.color.font_primary') ) .fontSize($r('sys.float.Body_L')) .maxFontScale(Constants.DIALOG_TEXT_MAX_SCALE) + .lineHeight(isTibetanLanguage() ? Constants.TEXT_BIG_LINE_HEIGHT : 0) .margin(params.isWearable ? { left: Constants.MARGIN_26, right: Constants.MARGIN_26, -- Gitee