Merge #704 into sdk602patch0626 from refs/changes/704/head 705/target/1
author袁清梦 <3449750381@qq.com>
Fri, 16 Aug 2024 01:38:14 +0000 (01:38 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 16 Aug 2024 01:38:14 +0000 (01:38 +0000)
commit1f4bf7098bfc0a37e3d800bad1fdbafb62a29f45
tree59bb939ec7e4201eb1d3db2541e49c29148a0aa8
parent9fea2b3ac56d5a599b5bfda6a462295d591b41c6
Merge #704 into sdk602patch0626 from refs/changes/704/head

Code review from 袁清梦

* refs/changes/704/head: (7 commits squashed)

  - 更新主界面心率卡片UI

  - 增加当日历史心率数据处理

  - 同步心率UI资源文件更新

  - 更新多国语言脚本 实现自动copy

  - ● 修改卡片管理样式与figma保持一致纵向
    ● 增加卡片管理表冠控制
    ● 增加卡片管理滑动条效果

  - 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

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/704
20 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_image.h
code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp
code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRateView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/heart.bin
code/sdk/drivers/peripheral/utils/custom_utils.c
tools/image_converter_tool/test/hert/heart/BOTTOM.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart/COOR.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart/TOP.png [new file with mode: 0644]
tools/language_tool/make_language.sh
tools/language_tool/多国语言工具脚本.md