Merge #1193 into sdk602patch0911 from refs/changes/1193/head
author袁清梦 <3449750381@qq.com>
Tue, 15 Oct 2024 12:41:40 +0000 (12:41 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 15 Oct 2024 12:41:40 +0000 (12:41 +0000)
commit8cad019093c563be687282c60f1aa37382fdd55e
tree7662e1f77e22f9e52f69e333e75859e40aea8def
parente3512a12e6d2ec7c461ccfd15e9fba8cc15b6f9d
Merge #1193 into sdk602patch0911 from refs/changes/1193/head

Code review from 袁清梦

* refs/changes/1193/head: (15 commits squashed)

  - 训练:优化配速表心率表的存储

  - 表盘:水母表盘更新

  - 表盘:小狗表盘更新

  - 表盘;小猫表盘更新

  - 表盘:星空表盘更新

  - 表盘:绿叶表盘更新

  - 表盘:宇航员表盘更新

  - 表盘:卫星表盘更新

  - 表盘:飞鸟表盘更新

  - 表盘:更新晨曦智影与镜影行者

  - 表盘:自定义表盘电池坐标优化

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

  - 心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。

  - 系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符

  - 表盘:优化运动表盘

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/1193
47 files changed:
code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp
code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp
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/main/src/MainPresenterSample.cpp
code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.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/106/galaxy.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/instance/101/sport.xml
tools/dial_converter_tool/instance/103/jellyfish.xml
tools/dial_converter_tool/instance/104/dog.xml
tools/dial_converter_tool/instance/105/kitty.xml
tools/dial_converter_tool/instance/106/galaxy.xml
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 [deleted file]
tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png [deleted file]
tools/dial_converter_tool/instance/113/HOURHAND.png [deleted file]
tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png
tools/dial_converter_tool/instance/113/MINUTEHAND.png [deleted file]
tools/dial_converter_tool/instance/113/dawninsight.png [moved from tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png with 100% similarity]
tools/dial_converter_tool/instance/113/dawninsight.xml [moved from tools/dial_converter_tool/instance/116/time.xml with 52% similarity]
tools/dial_converter_tool/instance/113/golden_ball.png [deleted file]
tools/dial_converter_tool/instance/113/golden_ball.xml [deleted file]
tools/dial_converter_tool/instance/116/time.png [deleted file]