From: Caisking <3449750381@qq.com> Date: Thu, 25 Jul 2024 07:59:05 +0000 (+0800) Subject: 增加表盘艺术字文件以及配置 X-Git-Tag: release_V1.2.70_20241020_135402~748^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4ef703fe5b5d559306e1e00adb27898021cd3227;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 29694171e..27a743735 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -414,7 +414,9 @@ namespace OHOS // 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::NEW_FONT_DIR, GILROY_BOLD_FONT); // 注册字体 + 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, SHEEPING_CATS_FONT); // 注册字体 + WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher"); /* -------------------------------------------------------------------------- */ // 从语言json配置里面读取语言包 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Sheeping_Cats.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Sheeping_Cats.ttf new file mode 100644 index 000000000..31705c9fe Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Sheeping_Cats.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 172333bec..07e4f00a2 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 @@ -506,6 +506,7 @@ namespace OHOS { #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" #else #if ENABLE_VECTOR_FONT #define DEFAULT_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular.otf"