From: 彭磊 <1624952103@qq.com> Date: Thu, 29 Aug 2024 13:29:29 +0000 (+0000) Subject: Merge #827 into sdk602patch0626 from refs/changes/827/head X-Git-Tag: release_V1.2.70_20241020_135402~562^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d0e2a14ba773986ade8768897538e84eb11bcd68;p=mirrors%2FFD230.git Merge #827 into sdk602patch0626 from refs/changes/827/head Code review from 彭磊 * refs/changes/827/head: (4 commits squashed) - 优化睡眠状态时间戳计算 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 优化黑曜表盘UI - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/827 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 27ce088dc..098d787e4 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -459,10 +459,11 @@ 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, AUDIOWIDE_REGULAR_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); // 注册字体 + 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 WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h index eefd660fe..c5e746336 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-06-07 11:18:25 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-08-28 11:28:26 + * @LastEditTime: 2024-08-29 17:52:26 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h * @Description: * @@ -38,8 +38,8 @@ namespace OHOS int GetWeatherData(void); private: - float Weather_ = 0; // 默认晴天 - std::string Weather_Str = "25° 晴"; + float Weather_ = 11; // 默认unkown + std::string Weather_Str = "/°"; }; } #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h index 422028936..6aa88a44b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h @@ -33,7 +33,7 @@ namespace OHOS void UpdateWeatherStr(const std::string dialWeatherStr); private: - std::string dialWeatherStr_; + std::string dialWeatherStr_ = "/°"; }; } #endif \ No newline at end of file diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Audiowide_Regular.ttf b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Audiowide_Regular.ttf new file mode 100644 index 000000000..348817d57 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font_library/Audiowide_Regular.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 07e4f00a2..4f41a4e89 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 @@ -507,6 +507,7 @@ namespace OHOS { #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" #else #if ENABLE_VECTOR_FONT #define DEFAULT_VECTOR_FONT_FILENAME "SourceHanSansSC-Regular.otf" diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml index e544170e0..6deae993b 100644 --- a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml +++ b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml @@ -10,23 +10,23 @@ - + - + - + - + - + - + @@ -38,11 +38,11 @@ - + - + - +