Merge #1012 into sdk602patch0626 from refs/changes/1012/head 1016/target/2
author胡传军 <1224667075@qq.com>
Wed, 25 Sep 2024 14:22:16 +0000 (14:22 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 25 Sep 2024 14:22:16 +0000 (14:22 +0000)
commit34c6da4b250da6dd2205f5e23b93d1eee47f0600
tree96c6f2f9709aad6c31b3b8afcfb0ce0b92bcdb67
parente1c99a9ad4c320d3796caf6f0a4260ebff1ba225
Merge #1012 into sdk602patch0626 from refs/changes/1012/head

Code review from 胡传军

* refs/changes/1012/head: (26 commits squashed)

  - 修复同步实时运动数据存在的BUG

  - 蓝牙文件取消传输修改

  - 电话bug综合修复

  - 电话bug综合修复(补)

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

  - 修复电话死机问题

  - 修复蓝牙通话死机问题

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

  - 修复天气json数据异常导致的死机问题,更改sos协议,更改语言切换逻辑

  - 修复天气json数据异常导致的死机问题(补)

  - Mp3文件传输重写

  - 修复自定义表盘ID不能对应问题

  - 修复站立目标设置没生效bug

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

  - 训练协议修改,待测试

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

  - 修复蓝牙动画可能卡死问题 #616

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

  - 电话综合修复 #547

  - ble广播将不在随开关控制,增加JSON判断

  - ble闹钟修复

  - ble广播将不在随开关控制,增加JSON判断(补 )

  - 增加循环震动 #753

  - 优化OTA传输过程中刷新进度条代码#725待测试是否不再复现

  - 适配通讯录人名长度修改

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

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/1012
25 files changed:
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallerDisplayView.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/DialingScreenView.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/WaitingHintsView.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneDirView.h
code/sdk/application/wearable/fd230app/nativeui/phone/include/phoneaddressmodel.h
code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/src/TelephonyInitInterface.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.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
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp