diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 26c7cc0fd3a7d601537f32ffd9b145bc106ca91e..40494beae80ae2a4eabcdcf3fc65ce48d0534059 100644 --- a/application/AppScope/app.json +++ b/application/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000026, - "versionName": "1.0.26", + "versionCode": 10000027, + "versionName": "1.0.27", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/AppScope/app.json5 b/application/AppScope/app.json5 index c708a31fa3572a25a646c0ab02285951b6e7cf1b..878d650d8f1966929d6cd97c1e041491f2cbe299 100644 --- a/application/AppScope/app.json5 +++ b/application/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000026, - "versionName": "1.0.26", + "versionCode": 10000027, + "versionName": "1.0.27", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/entry/src/main/ets/common/constants/CommonConstants.ets b/application/entry/src/main/ets/common/constants/CommonConstants.ets index 2e4c19bf88526e0242f08f9b49403fcbc2c9c4b2..4e48e9a4bcae5788869b408e0bbc2663bd6e20a1 100644 --- a/application/entry/src/main/ets/common/constants/CommonConstants.ets +++ b/application/entry/src/main/ets/common/constants/CommonConstants.ets @@ -55,6 +55,8 @@ export default class CommonConstants { public static readonly UPDATE_PROMPT_MARGIN_TOP: number = 9; // isMirrorLanguages public static readonly MIRROR_LANGUAGES: Array = ['ug']; + // isTibetanLanguages + public static readonly TIBETAN_LANGUAGES: Array = ['bo']; } export enum FontSizeScale { diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index 041a1c41960613455a5d875fc859a717312234f6..b06b0958155edead452f5203edbd7c7e363c2e7e 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -397,7 +397,7 @@ struct ContinueSwitch { .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.ohos_id_color_text_primary')) .textAlign(TextAlign.Start) - .lineHeight(CommonConstants.UPDATE_PROMPT_LINE_HEIGHT) + .lineHeight(-1) } .margin({ top: CommonConstants.UPDATE_PROMPT_MARGIN_TOP }) } @@ -415,6 +415,7 @@ struct ContinueSwitch { .fontColor($r('sys.color.ohos_id_color_text_secondary')) .textAlign(TextAlign.Start) .width('100%') + .lineHeight(this.isTibetanLanguages() ? 19 : 0) } .padding({ left: CommonConstants.TEXT_LIST_ALIGN_DISTANCE, @@ -543,4 +544,11 @@ struct ContinueSwitch { let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); return CommonConstants.MIRROR_LANGUAGES.includes(locale); } + + private isTibetanLanguages(): boolean { + logger.info(`${TAG} isTibetanLanguages in`); + let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); + logger.info(`${TAG} isTibetanLanguages: ${locale}`); + return CommonConstants.TIBETAN_LANGUAGES.includes(locale); + } } \ No newline at end of file diff --git a/application/entry/src/main/module.json b/application/entry/src/main/module.json index 4e076f25957af3f21403d1634d0127fa83d6ddcf..9765740fab2d8dc3b64d4ce3a9556bf57a0f1294 100644 --- a/application/entry/src/main/module.json +++ b/application/entry/src/main/module.json @@ -68,6 +68,9 @@ { "name": "action.settings.search.path", "value": "searchConfig/searchPage.json" + }, + { + "name": "ohos.graphics2d.text.adapter_text_height" } ] } diff --git a/application/entry/src/main/module.json5 b/application/entry/src/main/module.json5 index 6623fed4f225f369ced4b8aae5f898b07fc60e98..f36e6173d19533d2fa3d1300a1126805d0cce179 100644 --- a/application/entry/src/main/module.json5 +++ b/application/entry/src/main/module.json5 @@ -82,6 +82,9 @@ { "name": "action.settings.search.path", "value": "searchConfig/searchPage.json" + }, + { + "name": "ohos.graphics2d.text.adapter_text_height" } ] }