Merge #1005 into sdk602patch0626 from refs/changes/1005/head 1006/target/2
author胡传军 <1224667075@qq.com>
Tue, 24 Sep 2024 09:00:17 +0000 (09:00 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 24 Sep 2024 09:00:17 +0000 (09:00 +0000)
commitb5dc9115e1e31c37c1d40b88f2e43ea2287e19fd
tree33a16b568d817df1edbe651036699ce97bd4a755
parent4b04677a450f99132855d9bda8234a0294d134e4
Merge #1005 into sdk602patch0626 from refs/changes/1005/head

Code review from 胡传军

* refs/changes/1005/head: (13 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

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/1005
21 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp
code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h
code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchModel.h
code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchView.h
code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/include/phoneaddressmodel.h
code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp
code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.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/msg_center/include/notify/transmitting.h
code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
code/sdk/drivers/peripheral/utils/custom_utils.c