Merge #673 into sdk602patch0626 from refs/changes/673/head 668/target/2
author袁清梦 <3449750381@qq.com>
Sat, 10 Aug 2024 11:03:27 +0000 (11:03 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 10 Aug 2024 11:03:27 +0000 (11:03 +0000)
commit04bbfae0af26fb6fea81b63636395bf3b91f6d2d
tree67402e14b89b0fa1c196db47fa33494944b2bc83
parente29484b6d9adeedfe09e3b26ed63b97f729ded26
Merge #673 into sdk602patch0626 from refs/changes/673/head

Code review from 袁清梦

* refs/changes/673/head: (39 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关闭不必要的打印 增加新数据类型

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

  - 修改遥控拍照的析构适配

  - 训练记录修改析构适配

  - 优化控件初始化函数

  - 对应组件进行nullptr初始化

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

  - 优化省电模式进入UI;并且适配按键回退

  - 实现消息列表自适应大小

  - 修改动画的反应速度为80ms

  - 关闭主界面到applist的动画效果

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

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/673
31 files changed:
code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodDetectionView.h
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodResultView.h
code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartDetectionView.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h
code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageItemView.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageLackView.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageShowView.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageView.h
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveElePresenter.h
code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleView.h
code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp
code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
code/sdk/application/wearable/nativeabilityfwk/src/transition/ZoomTransition.cpp