From: luozheng <1732036298@qq.com> Date: Tue, 6 Jan 2026 09:48:20 +0000 (+0800) Subject: 默认表盘修改提交 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3038%2Ftarget%2F1;p=mirrors%2FFD230.git 默认表盘修改提交 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h index e26c6d3ba..fbb24f28b 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h @@ -34,12 +34,12 @@ namespace OHOS }DialLayout; // 定义特殊Id - constexpr uint16_t DEFAULT_DIAL_ID = 114; - constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028; - constexpr uint16_t DEFAULT_DIAL_ID_1 = 111; - constexpr uint16_t DEFAULT_DIAL_ID_2 = 112; - constexpr uint16_t DEFAULT_DIAL_ID_3 = 113; - constexpr uint16_t MAX_DEFAULT_DIAL_ID = 115; + constexpr uint16_t DEFAULT_DIAL_ID = 207; + constexpr uint16_t DEFAULT_DIAL_ID_0 = 1030; + constexpr uint16_t DEFAULT_DIAL_ID_1 = 206; + constexpr uint16_t DEFAULT_DIAL_ID_2 = 208; + constexpr uint16_t DEFAULT_DIAL_ID_3 = 209; + constexpr uint16_t MAX_DEFAULT_DIAL_ID = 210; // 定义自定义表盘 constexpr uint16_t CUSTOM_DIAL_ID_1 = 1; constexpr uint16_t CUSTOM_DIAL_ID_2 = 2; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp index fe1d5312e..467895230 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp @@ -37,6 +37,9 @@ namespace OHOS { // 表盘map[Id--dialname] 前5个ID固定 std::unordered_map registeredDials{ {DEFAULT_DIAL_ID_0, "FD272"}, + {DEFAULT_DIAL_ID_1, "classic_elegance"}, + {DEFAULT_DIAL_ID, "owl_clock"}, + {DEFAULT_DIAL_ID_2, "essential_sport"}, }; // 表盘市场UID 对应表盘name // 存储表盘到文件 @@ -470,15 +473,11 @@ void SetDialModel::LoadAllDialFromFs() { 加载默认表盘 */ const std::vector defaultDials = { - "obsidianrhythm", "mirrorvoyager", "satellite", "dawninsight", "birdie", + "classic_elegance", "owl_clock", "essential_sport", "forest_time", "morning_light", }; void SetDialModel::LoadAllDialFromDefult(void) { - - return; // 暂时没有默认表盘 - - DIR *dirp = opendir(APP_DEFAULT_DIAL_PATH); if (dirp == nullptr) { perror("Failed to open directory"); diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/birdie.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/birdie.bin deleted file mode 100644 index a581591c3..000000000 Binary files a/code/sdk/files/fd272/fs/user/dial/res_dial/birdie.bin and /dev/null differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/classic_elegance.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/classic_elegance.bin new file mode 100644 index 000000000..9341dc1c0 Binary files /dev/null and b/code/sdk/files/fd272/fs/user/dial/res_dial/classic_elegance.bin differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/dawninsight.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/dawninsight.bin deleted file mode 100644 index 6172d758b..000000000 Binary files a/code/sdk/files/fd272/fs/user/dial/res_dial/dawninsight.bin and /dev/null differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/essential_sport.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/essential_sport.bin new file mode 100644 index 000000000..f1d90878a Binary files /dev/null and b/code/sdk/files/fd272/fs/user/dial/res_dial/essential_sport.bin differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/mirrorvoyager.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/mirrorvoyager.bin deleted file mode 100644 index 0f4ff4972..000000000 Binary files a/code/sdk/files/fd272/fs/user/dial/res_dial/mirrorvoyager.bin and /dev/null differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/obsidianrhythm.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/obsidianrhythm.bin deleted file mode 100644 index fb2cdcb13..000000000 Binary files a/code/sdk/files/fd272/fs/user/dial/res_dial/obsidianrhythm.bin and /dev/null differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/owl_clock.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/owl_clock.bin new file mode 100644 index 000000000..dd94dd456 Binary files /dev/null and b/code/sdk/files/fd272/fs/user/dial/res_dial/owl_clock.bin differ diff --git a/code/sdk/files/fd272/fs/user/dial/res_dial/satellite.bin b/code/sdk/files/fd272/fs/user/dial/res_dial/satellite.bin deleted file mode 100644 index 0fab57d5a..000000000 Binary files a/code/sdk/files/fd272/fs/user/dial/res_dial/satellite.bin and /dev/null differ diff --git a/tools/dial_tools/dial_lzma/206/classic_elegance.lzma b/tools/dial_tools/dial_lzma/206/classic_elegance.lzma new file mode 100644 index 000000000..da05e7bba Binary files /dev/null and b/tools/dial_tools/dial_lzma/206/classic_elegance.lzma differ diff --git a/tools/dial_tools/out/classic_elegance.bin b/tools/dial_tools/out/classic_elegance.bin new file mode 100644 index 000000000..9341dc1c0 Binary files /dev/null and b/tools/dial_tools/out/classic_elegance.bin differ