Merge #143 into xts_origin from refs/changes/143/head
author袁清梦 <3449750381@qq.com>
Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)
commit8ce7b38a0249e30ef586124943ea18fc88a6b243
tree0798758d54e71d95669797a46b7b1d55021227e7
parentbb5357faf5f686953f0a9c7c3dea6524b631aedb
Merge #143 into xts_origin from refs/changes/143/head

Code review from 袁清梦

* refs/changes/143/head: (21 commits squashed)

  - 替换结构体成员变量

  - 更新多国语言xml以及font文件

  - 更新训练Slice的多国语言配置

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

  - 优化设置训练频率

  - 适配心率Slice多国语言

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

  - 多国语言支持变量适配(updateLabel)

  - 增加佩戴状态下的无效数控制

  - 更新字体文件

  - 优化心率血氧time的更新显示逻辑

  - 适配血氧Slice多国语言

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

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

  - 适配信息通知Slice多国语言

  - 适配训练记录Slice多国语言

  - 增加label适配多国语言函数

  - 删除部分打印

  - 增加训练记录列表

  - 训练记录同步make

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

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/143
18 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordAdapter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordItemView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordModel.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordAdapter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h
code/sdk/drivers/peripheral/cywee/src/main_dml.c