From: SnickerSun Date: Fri, 30 Aug 2024 12:55:28 +0000 (+0800) Subject: 添加多国语言字体切换逻辑，逻辑可用，字体还不完整 X-Git-Tag: release_V1.2.70_20241020_135402~549^2~2^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=bd5b9bc4da9e6444ca20edf85a5b081c08482fb3;p=mirrors%2FFD230.git 添加多国语言字体切换逻辑，逻辑可用，字体还不完整 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 098d787e4..9557e9195 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -458,15 +458,24 @@ namespace OHOS #endif // ConfigModel::GetInstance()->Init(); // 初始化语言 - GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::VECTOR_FONT_DIR, DEFAULT_VECTOR_FONT_FILENAME); + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::VECTOR_FONT_DIR, HARMONYOS_VECTOR_FONT_FILENAME); GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, GILROY_BOLD_FONT); // 注册字体 GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, AUDIOWIDE_REGULAR_FONT); // 注册字体 + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, KOREA_FONT); // 注册字体 //韩语 + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, HINDI_FONT); // 注册字体 //印地语 + // GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, THAI_FONT); // 注册字体 //泰语 + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, PERSIAN_FONT); // 注册字体 //波斯语 + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, ARABIC_FONT); // 注册字体 //阿拉伯语 + GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, HEBREW_FONT); // 注册字体 //希伯来语 + #if 0 GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, SHEEPING_CATS_FONT); // 注册字体 GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, GILROY_REGULAR_FONT); // 注册字体 #endif + //默认设置全局字体为HarmonyOSFont，其他时候根据语言选择字体名字 + set_current_global_font_name(HARMONYOS_VECTOR_FONT_FILENAME); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher"); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher fontname %s",DEFAULT_VECTOR_FONT_FILENAME); /* -------------------------------------------------------------------------- */ // 从语言json配置里面读取语言包 if (language::GetInstance()->InitLangues() == false) diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp index 0c9254b03..d53c60202 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 * @LastEditors: SnickerSun snickersun@163.com - * @LastEditTime: 2024-07-27 11:50:49 + * @LastEditTime: 2024-08-30 20:45:36 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp */ #include @@ -21,78 +21,110 @@ namespace OHOS { // 初始化 languages 数组 struct Language languages[] = { - {ZH_CN, "zh", "中文", "中文"}, - {EN, "en", "English", "英语"}, - {JA, "ja", "日本語", "日语"}, - {KO, "ko", "한국어", "韩语"}, - {ES, "es", "Español", "西班牙语"}, - {RU, "ru", "Русский", "俄语"}, - {HR, "hr", "Hrvatski", "克罗地亚语"}, - {DE, "de", "Deutsch", "德语"}, - {PT, "pt", "Português", "葡萄牙语"}, - {FR, "fr", "Français", "法语"}, - {NL, "nl", "Nederlands", "荷兰语"}, - {IT, "it", "Italiano", "意大利语"}, - {CS, "cs", "ČeÅ¡tina", "捷克语"}, - {EL, "el", "Ελληνικά", "希腊语"}, - {HI, "hi", "हिन्दी", "印地语"}, - {ID, "id", "Bahasa Indonesia", "印尼语"}, - {MS, "ms", "Bahasa Melayu", "马来语"}, - {PL, "pl", "Polski", "波兰语"}, - {TH, "th", "ไทย", "泰语"}, - {VI, "vi", "Tiếng Việt", "越南语"}, - {FI, "fi", "Suomi", "芬兰语"}, - {RO, "ro", "Română", "罗马尼亚语"}, - {TR, "tr", "Türkçe", "土耳其语"}, - {FA, "fa", "فارسی", "波斯语"}, - {AR, "ar", "العربية", "阿拉伯语"}, - {HE, "he", "עברית", "希伯来语"}, - {UK, "uk", "Українська", "乌克兰语"}, - {SV, "sv", "Svenska", "瑞典语"}, - {UZ, "uz", "O‘zbek", "乌兹别克语"}, - {AZ, "az", "Azərbaycan dili", "阿塞拜疆语"}, + {ZH_CN, "zh", "中文", "中文",HARMONYOS_VECTOR_FONT_FILENAME}, + {EN, "en", "English", "英语",HARMONYOS_VECTOR_FONT_FILENAME}, + {JA, "ja", "日本語", "日语",HARMONYOS_VECTOR_FONT_FILENAME}, + {KO, "ko", "한국어", "韩语",KOREA_FONT}, + {ES, "es", "Español", "西班牙语",HARMONYOS_VECTOR_FONT_FILENAME}, + {RU, "ru", "Русский", "俄语",HARMONYOS_VECTOR_FONT_FILENAME}, + {HR, "hr", "Hrvatski", "克罗地亚语",HARMONYOS_VECTOR_FONT_FILENAME}, + {DE, "de", "Deutsch", "德语",HARMONYOS_VECTOR_FONT_FILENAME}, + {PT, "pt", "Português", "葡萄牙语",HARMONYOS_VECTOR_FONT_FILENAME}, + {FR, "fr", "Français", "法语",HARMONYOS_VECTOR_FONT_FILENAME}, + {NL, "nl", "Nederlands", "荷兰语",HARMONYOS_VECTOR_FONT_FILENAME}, + {IT, "it", "Italiano", "意大利语",HARMONYOS_VECTOR_FONT_FILENAME}, + {CS, "cs", "ČeÅ¡tina", "捷克语",HARMONYOS_VECTOR_FONT_FILENAME}, + {EL, "el", "Ελληνικά", "希腊语",HARMONYOS_VECTOR_FONT_FILENAME}, + {HI, "hi", "हिन्दी", "印地语",HINDI_FONT}, + {ID, "id", "Bahasa Indonesia", "印尼语",HARMONYOS_VECTOR_FONT_FILENAME}, + {MS, "ms", "Bahasa Melayu", "马来语",HARMONYOS_VECTOR_FONT_FILENAME}, + {PL, "pl", "Polski", "波兰语",HARMONYOS_VECTOR_FONT_FILENAME}, + {TH, "th", "ไทย", "泰语",HARMONYOS_VECTOR_FONT_FILENAME},//THAI_FONT + {VI, "vi", "Tiếng Việt", "越南语",HARMONYOS_VECTOR_FONT_FILENAME}, + {FI, "fi", "Suomi", "芬兰语",HARMONYOS_VECTOR_FONT_FILENAME}, + {RO, "ro", "Română", "罗马尼亚语",HARMONYOS_VECTOR_FONT_FILENAME}, + {TR, "tr", "Türkçe", "土耳其语",HARMONYOS_VECTOR_FONT_FILENAME}, + {FA, "fa", "فارسی", "波斯语",PERSIAN_FONT}, + {AR, "ar", "العربية", "阿拉伯语",ARABIC_FONT}, + {HE, "he", "עברית", "希伯来语",HEBREW_FONT}, + {UK, "uk", "Українська", "乌克兰语",HARMONYOS_VECTOR_FONT_FILENAME}, + {SV, "sv", "Svenska", "瑞典语",HARMONYOS_VECTOR_FONT_FILENAME}, + {UZ, "uz", "O‘zbek", "乌兹别克语",HARMONYOS_VECTOR_FONT_FILENAME}, + {AZ, "az", "Azərbaycan dili", "阿塞拜疆语",HARMONYOS_VECTOR_FONT_FILENAME}, }; - static const char *en = "user/res/font/en.lang"; - static const char *zh = "user/res/font/zh.lang"; - // static const char *ja = "user/res/font/ja.lang"; - // static const char *de = "user/res/font/de.lang"; - + // static const uint8_t langcount = 2; - const char *resFiles[MAX_LANGUAGE] = { + + const char *resFiles[MAX_LANGUAGE]= { "user/res/font/zh.lang",// ZH_CN = 0, "user/res/font/en.lang",// EN, - "user/res/font/zh.lang",// JA, - "user/res/font/zh.lang",// KO, - "user/res/font/zh.lang",// ES, - "user/res/font/zh.lang",// RU, - "user/res/font/zh.lang",// HR, - "user/res/font/zh.lang",// DE, - "user/res/font/zh.lang",// PT, - "user/res/font/zh.lang",// FR, - "user/res/font/zh.lang",// NL, - "user/res/font/zh.lang",// IT, - "user/res/font/zh.lang",// CS, - "user/res/font/zh.lang",// EL, - "user/res/font/zh.lang",// HI, - "user/res/font/zh.lang",// ID, - "user/res/font/zh.lang",// MS, - "user/res/font/zh.lang",// PL, - "user/res/font/zh.lang",// TH, - "user/res/font/zh.lang",// VI, - "user/res/font/zh.lang",// FI, - "user/res/font/zh.lang",// RO, - "user/res/font/zh.lang",// TR, - "user/res/font/zh.lang",// FA, - "user/res/font/zh.lang",// AR, - "user/res/font/zh.lang",// HE, - "user/res/font/zh.lang",// UK, - "user/res/font/zh.lang",// SV, - "user/res/font/zh.lang",// UZ, - "user/res/font/zh.lang"// AZ, - }; - + "user/res/font/ja.lang",// JA, + "user/res/font/ko.lang",// KO,韩语 + "user/res/font/es.lang",// ES, + "user/res/font/ru.lang",// RU, + "user/res/font/hr.lang",// HR, + "user/res/font/de.lang",// DE, + "user/res/font/pt.lang",// PT, + "user/res/font/fr.lang",// FR, + "user/res/font/nl.lang",// NL, + "user/res/font/it.lang",// IT, + "user/res/font/cs.lang",// CS, + "user/res/font/el.lang",// EL, + "user/res/font/hi.lang",// HI,印地语 + "user/res/font/id.lang",// ID, + "user/res/font/ms.lang",// MS, + "user/res/font/pl.lang",// PL, + "user/res/font/th.lang",// TH, 泰语 + "user/res/font/vi.lang",// VI, + "user/res/font/fi.lang",// FI, + "user/res/font/ro.lang",// RO, + "user/res/font/tr.lang",// TR, + "user/res/font/fa.lang",// FA,波斯语 + "user/res/font/ar.lang",// AR,阿拉伯语 + "user/res/font/he.lang",// HE,希伯来语 + "user/res/font/uk.lang",// UK, + "user/res/font/sv.lang",// SV, + "user/res/font/uz.lang",// UZ, + "user/res/font/az.lang"// AZ, + }; + //static language *g_planguage{nullptr}; + char current_global_font_name[256]={0}; + char* get_current_global_font_name(void) + { + return ¤t_global_font_name[0]; + } + + int set_current_global_font_name(const char* fontname) + { + memset(current_global_font_name,0,sizeof(current_global_font_name)); + return strcat_s(current_global_font_name,sizeof(current_global_font_name),fontname); + } + + /** + * return 1 从右到左 + * return 0 从左到右 + */ + int get_current_font_direction(void) + { + // 从右到左排版的语言 + // 阿拉伯语（Arabic） + // 希伯来语（Hebrew） + // 波斯语（Persian，也称为法尔斯语） + // 乌尔都语（Urdu） + // 阿拉米语（Aramaic） + char* fontname=get_current_global_font_name(); + if (memcpy_s(fontname,strlen(fontname),PERSIAN_FONT,strlen(PERSIAN_FONT)) == 0) + return 1; + else if (memcpy_s(fontname,strlen(fontname),ARABIC_FONT,strlen(ARABIC_FONT)) == 0) + return 1; + else if (memcpy_s(fontname,strlen(fontname),HEBREW_FONT,strlen(HEBREW_FONT)) == 0) + return 1; + else + return 0; + } + language::language() { @@ -156,12 +188,16 @@ namespace OHOS return false; } + if (currentLanguageId >= MAX_LANGUAGE || currentLanguageId < 0) + return false; + FontGlobalManager::GetInstance()->RegisterLanguageInfo(resFiles, MAX_LANGUAGE, currentLanguageId); UIFont::GetInstance()->SetCurrentLangId(currentLanguageId); ConfigModel::GetInstance()->SetLanguageCode(languages[currentLanguageId].code); ConfigModel::GetInstance()->SetLanguage(currentLanguageId); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles[language_status]:%s", resFiles[language_status]); + int ret = set_current_global_font_name(languages[currentLanguageId].fontname); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles [%d]:%s fontname:%s , ret = %d", currentLanguageId,resFiles[currentLanguageId],languages[currentLanguageId].fontname,ret); return true; } @@ -181,7 +217,8 @@ namespace OHOS ConfigModel::GetInstance()->SetLanguageCode(language_code.c_str()); ConfigModel::GetInstance()->SetLanguage(currentLanguageId); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles[%d]:%s", currentLanguageId, resFiles[currentLanguageId]); + int ret = set_current_global_font_name(languages[currentLanguageId].fontname); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles[%d]:%s fontname %s , ret = %d", currentLanguageId, resFiles[currentLanguageId], languages[currentLanguageId].fontname, ret ); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h index d5e472179..c668323f6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:30:03 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-30 10:03:25 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-08-30 20:37:49 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h */ #ifndef LANGUAGE_INIT_H @@ -54,6 +54,7 @@ namespace OHOS const char *code; const char *name; const char *description; + const char *fontname; }; // 声明 languages 数组为外部变量 diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp index c920e6359..8730b2116 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:28:03 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-28 09:34:06 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-08-30 20:49:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp */ #include "languagecode/include/LanguageSwitchListitemView.h" @@ -32,6 +32,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchListitemView::SetItemInfo"); m_LabelButtonExt.SetViewId(itemInfo.code); m_LabelButtonExt.SetText(itemInfo.name); + m_LabelButtonExt.SetFont(itemInfo.fontname, 30); } void LanguageSwitchListitemView::SetUpChild() diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA.TTF b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA.TTF new file mode 100644 index 000000000..bb5e44144 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA.TTF differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA_TH.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA_TH.ttf new file mode 100644 index 000000000..66ac05c80 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/AGRA_TH.ttf differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Championship.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Championship.ttf new file mode 100644 index 000000000..b96f3bec6 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Championship.ttf differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Handjet.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Handjet.ttf new file mode 100644 index 000000000..5a1489383 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Handjet.ttf differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Orbit-Regular.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Orbit-Regular.ttf new file mode 100644 index 000000000..db9562d1c Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Orbit-Regular.ttf differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Rubik-VariableFont_wght.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Rubik-VariableFont_wght.ttf new file mode 100644 index 000000000..bbab349a2 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Rubik-VariableFont_wght.ttf differ diff --git a/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h b/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h index 4f41a4e89..8e967215d 100755 --- a/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h +++ b/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h @@ -502,20 +502,46 @@ namespace OHOS { */ #ifdef VERSION_IOT -#define DEFAULT_VECTOR_FONT_FILENAME "HarmonyOS_Sans_SC_Regular.ttf" +#define HARMONYOS_VECTOR_FONT_FILENAME "HarmonyOS_Sans_SC_Regular.ttf" #define GILROY_REGULAR_FONT "Gilroy_Regular.ttf" #define GILROY_BOLD_FONT "Gilroy_Bold.ttf" #define GILROY_MEDIUM_FONT "Gilroy_Medium.ttf" #define SHEEPING_CATS_FONT "Sheeping_Cats.ttf" #define AUDIOWIDE_REGULAR_FONT "Audiowide_Regular.ttf" +#define KOREA_FONT "Orbit-Regular.ttf" //韩语 +#define HINDI_FONT "AGRA_TH.ttf" //印地语 +#define THAI_FONT "KartriderThaiOTFMedium.ttf" //泰语 +#define PERSIAN_FONT "Championship.ttf" //波斯语 +#define ARABIC_FONT "Rubik-VariableFont_wght.ttf"//阿拉伯语 +#define HEBREW_FONT "Handjet.ttf"//希伯来语 + #else #if ENABLE_VECTOR_FONT -#define DEFAULT_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular.otf" +#define HARMONYOS_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular.otf" #else -#define DEFAULT_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular" +#define HARMONYOS_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular" #endif #endif + +/** + * return char* 当前字体名 +*/ +char* get_current_global_font_name(void); + +/** + * return 0 success +*/ +int set_current_global_font_name(const char* fontname); + +/** + * return 1 从右到左 + * return 0 从左到右 +*/ +int get_current_font_direction(void); + +#define DEFAULT_VECTOR_FONT_FILENAME get_current_global_font_name() + /* resources path. */ #ifdef VERSION_IOT #define RES_PATH "/user/res/" diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/base/js_fwk_common.h b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/base/js_fwk_common.h index 12c525fb3..664f57fc8 100755 --- a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/base/js_fwk_common.h +++ b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/base/js_fwk_common.h @@ -116,7 +116,7 @@ constexpr uint8_t FONT_FAMILY_FILE_NAME_SIZE = 128; #ifdef FEATURE_COMPONENT_CANVAS constexpr uint8_t DEFAULT_FONT_LETTERSPACE = 2; #endif // FEATURE_COMPONENT_CANVAS -constexpr char DEFAULT_FONT_FAMILY[] = DEFAULT_VECTOR_FONT_FILENAME; +constexpr char DEFAULT_FONT_FAMILY[] = HARMONYOS_VECTOR_FONT_FILENAME; // common attributes constexpr char ATTR_WIDTH[] = "width"; // tab-bar | image-animator