Merge #684 into sdk602patch0626 from refs/changes/684/head 685/target/1 686/target/1 687/target/1
author袁清梦 <3449750381@qq.com>
Mon, 12 Aug 2024 12:19:25 +0000 (12:19 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Mon, 12 Aug 2024 12:19:25 +0000 (12:19 +0000)
commitb3f37f4a34a2791ce53c3b8b9db55f9431d13538
treeb5da2b1bdca03d1d0c71cfd89b3f0698c4590bf9
parentad1d2a765bc519cfec51328b555ae7a7b00725b6
Merge #684 into sdk602patch0626 from refs/changes/684/head

Code review from 袁清梦

* refs/changes/684/head: (3 commits squashed)

  - 删除重复的container_的Add

  - 更新默认表盘资源文件

  - 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/684
12 files changed:
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin