Merge #1323 into sdk602patch0911 from refs/changes/1323/head 1324/target/1
author罗正 <1732036298@qq.com>
Sat, 2 Nov 2024 11:19:46 +0000 (11:19 +0000)
committer袁清梦 <3449750381@qq.com>
Sat, 2 Nov 2024 11:19:46 +0000 (11:19 +0000)
commit7e34585b39b9dafbf21d0a17ed28a43902e5be2c
tree38638b11464af16eb5bb0e2646a4a2e686db60c6
parent6b75f1fd7737ec2b7b9edbc9a35db2d87a537ac6
Merge #1323 into sdk602patch0911 from refs/changes/1323/head

Code review from 罗正

* refs/changes/1323/head: (9 commits squashed)

  - ScreenTurnOn与ScreenTurnOff配套使用优化

  - 解决蓝牙耳机按键退出有概率不取消常亮屏

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

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

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

  - 时间同步算法采用海思原本代码

  - 喝水提醒,久坐提醒,运动识别弹窗时间保存采用队列方式

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

  - 表盘:增加电量字符串数据类型

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1323
15 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStr.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStr.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h
code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModelC.h
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLogModel.cpp
code/sdk/application/wearable/service/msg_center/src/notify/drinkReminder_notification.cpp
code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp
code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp
code/sdk/drivers/chips/brandy/porting/liteos/riscv70/tick_timer.c
code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
code/sdk/drivers/peripheral/utils/custom_utils.h
tools/dial_converter_tool/dial_lzma/105/kitty.lzma
tools/dial_converter_tool/instance/105/kitty.xml