Merge #423 into sdk602patch0521 from refs/changes/423/head
author胡传军 <1224667075@qq.com>
Tue, 2 Jul 2024 01:21:48 +0000 (01:21 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 2 Jul 2024 01:21:48 +0000 (01:21 +0000)
commit4c665b41ea5197d6dac168de6060f89927e8ecfa
tree8bbc5a9d09e8f3718f674bf96f7d96086d2cccaf
parent26db9cb3a06b19228fdbab737b21c1f380e0bbd3
Merge #423 into sdk602patch0521 from refs/changes/423/head

Code review from 胡传军

* refs/changes/423/head: (17 commits squashed)

  - 修复表盘协议BUG

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

  - 低电量修改

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

  - 优化低电量关机

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

  -  更改低电量报警

  - ble扫描过滤去除,ble read属性更新

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

  - 修改步数等数据存储,从记录一小时内的增值,改为记录当前时间点总值

  - 补交

  - LCD

  - LCD补交

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

  - 表盘BUG修复

  - AI语音ble协议更新,协议已测试,UI还需要修改

  - 表盘map增加误判断,避免错误id因为不当操作注册进来

Signed-off-by: aliyun8003852482 <1224667075@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/423
code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c