Merge #1377 into sdk602patch0911 from refs/changes/1377/head
author袁清梦 <3449750381@qq.com>
Sat, 9 Nov 2024 08:56:54 +0000 (08:56 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 9 Nov 2024 08:56:54 +0000 (08:56 +0000)
commit0737114671dfa355dfaa04bfe16276a50b7bbed0
treec5513acae2693c6e917c81af504d4d52adb23cd4
parent5a99cf21f8dc5f0d6b611d2b83f861dc95ed1880
Merge #1377 into sdk602patch0911 from refs/changes/1377/head

Code review from 袁清梦

* refs/changes/1377/head: (4 commits squashed)

  - 系统:优化vote获取显示

  - 系统:修复vote的显示

  - #1149 APP--黑曜表盘显示图替换成实际表盘效果图

  - #1000 手表,开启睡眠模式后,在开室内走路运动,之后关闭掉回主表盘,顶部的睡眠模式图标消失,进出菜单后恢复

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1377
17 files changed:
code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h
code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
code/sdk/application/wearable/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/mirrorvoyager.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/obsidianrhythm.bin
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/drivers/peripheral/utils/custom_utils.h
tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma
tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.png
tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma
tools/dial_converter_tool/instance/114/obsidianrhythm.png
tools/dial_converter_tool/instance/115/mirrorvoyager.png