Merge #667 into sdk602patch0626 from refs/changes/667/head
author袁清梦 <3449750381@qq.com>
Sat, 10 Aug 2024 01:52:34 +0000 (01:52 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 10 Aug 2024 01:52:34 +0000 (01:52 +0000)
commit989ee240f4757eb857a88bef02897957301dbb75
tree6453dd0e020184808b004a81673b21740d91c52b
parentbc559e16e11293624ecc9b63d6e0ff34fd188eda
Merge #667 into sdk602patch0626 from refs/changes/667/head

Code review from 袁清梦

* refs/changes/667/head: (28 commits squashed)

  - 屏蔽血氧监测过程中的数值显示

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 增加表盘星期string类model

  - 增加血氧&amp;心率数据重启之后恢复

  - 筛选表盘血氧无效数据

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 修复星期显示

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 适配早安闹钟小睡功能

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 增加新的表盘数据类型

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 更新表盘配置 详情见dial_readme

  - 同步表盘lzma文件更新

  - 更新表盘原资源文件

  - 增加离线表盘开发指南

  - 优化组件初始化函数

  - 优化 UIViewGroup Add 函数 添加错误可以查看组件信息

  - 删除缓存文件

  - 增加Dial星期数据类型

  - 增加日期Dial数据类型

  - 增加时间的4个数据位数据类型

  - 设置表盘界面增加表盘控制:目前只有覆盖流生效

  - DialLabel关闭不必要的打印 增加新数据类型

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/667
96 files changed:
code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateStr.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourMin.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourTens.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourUnits.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinTens.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinUnits.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialLabelView.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateStr.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourTens.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourUnits.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view_group.cpp
tools/dial_converter_tool/dial_lzma/101/sport.lzma
tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma
tools/dial_converter_tool/dial_lzma/104/dog.lzma
tools/dial_converter_tool/dial_lzma/105/kitty.lzma
tools/dial_converter_tool/dial_lzma/1052/classic.lzma
tools/dial_converter_tool/dial_lzma/106/galaxy.lzma
tools/dial_converter_tool/dial_lzma/107/geometry.lzma
tools/dial_converter_tool/dial_lzma/108/maomao.lzma
tools/dial_converter_tool/dial_lzma/109/succulents.lzma
tools/dial_converter_tool/dial_lzma/110/spaceman.lzma
tools/dial_converter_tool/dial_lzma/111/satellite.lzma
tools/dial_converter_tool/dial_lzma/112/birdie.lzma
tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma [new file with mode: 0644]
tools/dial_converter_tool/instance/101/sport.xml
tools/dial_converter_tool/instance/103/Array_Num/0.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/1.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/2.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/3.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/4.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/5.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/6.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/7.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/8.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/Array_Num/9.png [new file with mode: 0644]
tools/dial_converter_tool/instance/103/jellyfish.xml
tools/dial_converter_tool/instance/103/week/1.png [deleted file]
tools/dial_converter_tool/instance/103/week/2.png [deleted file]
tools/dial_converter_tool/instance/103/week/3.png [deleted file]
tools/dial_converter_tool/instance/103/week/4.png [deleted file]
tools/dial_converter_tool/instance/103/week/5.png [deleted file]
tools/dial_converter_tool/instance/103/week/6.png [deleted file]
tools/dial_converter_tool/instance/103/week/7.png [deleted file]
tools/dial_converter_tool/instance/103/week/FIRDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/MONDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/SATURDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/SUNDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/THURSDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/TUESDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/103/week/WEDNESDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/104/dog.xml
tools/dial_converter_tool/instance/105/kitty.xml
tools/dial_converter_tool/instance/1052/MAIN_FACE_IMAGE.png
tools/dial_converter_tool/instance/1052/classic.xml
tools/dial_converter_tool/instance/1052/week/1.png [deleted file]
tools/dial_converter_tool/instance/1052/week/2.png [deleted file]
tools/dial_converter_tool/instance/1052/week/3.png [deleted file]
tools/dial_converter_tool/instance/1052/week/4.png [deleted file]
tools/dial_converter_tool/instance/1052/week/5.png [deleted file]
tools/dial_converter_tool/instance/1052/week/6.png [deleted file]
tools/dial_converter_tool/instance/1052/week/7.png [deleted file]
tools/dial_converter_tool/instance/1052/week/FIRDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/MONDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/SATURDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/SUNDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/THURSDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/TUESDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/1052/week/WEDNESDAY_IMAGE_PATH.png [deleted file]
tools/dial_converter_tool/instance/106/MAIN_FACE_IMAGE.png
tools/dial_converter_tool/instance/106/galaxy.xml
tools/dial_converter_tool/instance/107/geometry.xml
tools/dial_converter_tool/instance/108/MAIN_FACE_IMAGE.png
tools/dial_converter_tool/instance/108/maomao.xml
tools/dial_converter_tool/instance/109/MAIN_FACE_IMAGE.png
tools/dial_converter_tool/instance/109/succulents.xml
tools/dial_converter_tool/instance/110/spaceman.xml
tools/dial_converter_tool/instance/111/satellite.xml
tools/dial_converter_tool/instance/112/birdie.xml
tools/dial_converter_tool/instance/113/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/HOURHAND.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/MINUTEHAND.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/golden_ball.png [new file with mode: 0644]
tools/dial_converter_tool/instance/113/golden_ball.xml [new file with mode: 0644]
tools/dial_converter_tool/离线表盘开发指南.docx [new file with mode: 0644]
tools/image_converter_tool/test/clock_test/Galaxy.bin [new file with mode: 0644]
tools/image_converter_tool/test/clocks/Galaxy.png [new file with mode: 0644]