Merge #978 into sdk602patch0626 from refs/changes/978/head
author袁清梦 <3449750381@qq.com>
Wed, 18 Sep 2024 02:28:23 +0000 (02:28 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 18 Sep 2024 02:28:23 +0000 (02:28 +0000)
commit98721b7644b68cbaaa56a6c5249d2e99d086caaa
treeefc672fd03f07dbdabaae6526364cf3d1420feb9
parentf8bc3665386a75da03e1007042464fee502aec44
Merge #978 into sdk602patch0626 from refs/changes/978/head

安全模式:下载修复文件增加repari_file_start接口

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

  - 安全模式:下载修复文件增加repari_file_start接口

  - 心率:增加心率动画的资源文件

  - 心率:修改心率UI;增加上一次检测数据以及检测间隔

  - 心率:同步心率卡片更新

  - 心率:修复心率卡片显示异常

  - 心率:心率动画修改

  - 心率:使用图片icon替换动画

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/978
66 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartView.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateCardView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp
code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/safemodemanager/include/SafeModeManagerModelC.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerModel.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/background.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_01.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_02.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_03.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_04.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_05.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_06.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_07.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_08.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_09.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_10.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_11.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_12.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_13.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_14.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_15.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_16.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_17.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_18.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_19.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_20.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart_chart/hearticon/HEARTICON_21.bin [new file with mode: 0644]
code/sdk/drivers/peripheral/utils/custom_cmd_service.c
code/sdk/drivers/peripheral/utils/custom_utils.h
tools/image_converter_tool/image_makcopy_tool.py [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart/back.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/background.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/buttomicon.png [moved from tools/image_converter_tool/test/hert/heartchart/buttomicon.png with 100% similarity]
tools/image_converter_tool/test/hert/heart_chart/hearticon.png [moved from tools/image_converter_tool/test/hert/heartchart/hearticon.png with 100% similarity]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_01.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_02.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_03.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_04.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_05.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_06.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_07.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_08.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_09.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_10.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_11.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_12.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_13.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_14.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_15.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_16.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_17.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_18.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_19.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_20.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/hearticon/HEARTICON_21.png [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/heartrate.gif [new file with mode: 0644]
tools/image_converter_tool/test/hert/heart_chart/topicon.png [moved from tools/image_converter_tool/test/hert/heartchart/topicon.png with 100% similarity]
tools/image_converter_tool/test/hert/heartchart/background.png [deleted file]