Merge #813 into sdk602patch0626 from refs/changes/813/head 818/target/1
author袁清梦 <3449750381@qq.com>
Thu, 29 Aug 2024 02:34:38 +0000 (02:34 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 29 Aug 2024 02:34:38 +0000 (02:34 +0000)
commit2525508374b18897cc46310c6a0de6b8acd4e3be
treee8e0bd098dd584ff6666a49c915079c49da28dfc
parent89a3b4a7bce02f61436fa56e3d4be810da271ea8
Merge #813 into sdk602patch0626 from refs/changes/813/head

Code review from 袁清梦

* refs/changes/813/head: (8 commits squashed)

  - 屏蔽KeyInputListener里面的不使用功能

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

  - 修复密码锁通过蓝牙解锁进行状态同步

  - 修改&quot;重新检测->重测“

  - 删除重复的字段

  - 修复睡眠进度条的两端为圆形

  - 修改每日目标进度条方向

  - 修改训练中进度条颜色为绿色

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/813
code/sdk/application/wearable/fd230app/nativeui/codedlock/include/CodedLockModel.h
code/sdk/application/wearable/fd230app/nativeui/codedlock/src/CodedLockModel.cpp
code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language.xlsx
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/zh.lang