Merge #1391 into sdk602patch0911 from refs/changes/1391/head
author袁清梦 <3449750381@qq.com>
Tue, 12 Nov 2024 10:14:39 +0000 (10:14 +0000)
committer袁清梦 <3449750381@qq.com>
Tue, 12 Nov 2024 10:14:39 +0000 (10:14 +0000)
commit33e73fa531b02ee18322445742bca950e67cc7a2
treec34552e27779f3ced5ff2c2240ebed61ce4d3910
parent91ea31d682b82fff9223ab7dc3a97d2cb46f683a
Merge #1391 into sdk602patch0911 from refs/changes/1391/head

Code review from 袁清梦

* refs/changes/1391/head: (2 commits squashed)

  - 表盘:增加活力数字表盘

  - 系统:屏蔽亮屏函数设置回到主界面时间;预防错误设置

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: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1391
25 files changed:
code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/128/vibrantnumber.png [moved from tools/dial_converter_tool/instance/128/Succulents.png with 100% similarity]
tools/dial_converter_tool/instance/128/nums/g_0.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_1.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_2.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_3.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_4.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_5.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_6.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_7.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_8.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/g_9.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_0.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_1.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_2.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_3.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_4.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_5.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_6.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_7.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_8.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/nums/w_9.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/vibrantnumber.png [new file with mode: 0644]
tools/dial_converter_tool/instance/128/vibrantnumber.xml [new file with mode: 0644]