Merge #1219 into sdk602patch0911 from refs/changes/1219/head 1218/target/2
author胡传军 <1224667075@qq.com>
Sun, 20 Oct 2024 03:51:39 +0000 (03:51 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sun, 20 Oct 2024 03:51:39 +0000 (03:51 +0000)
commit09122bd62dff27477eca71d7480376d0e90a73f3
tree6069cfbf205f0ed5b18f6435822d9adf1f06bb95
parenteff74391f3c967a900f93bf9193b97dc1087658f
Merge #1219 into sdk602patch0911 from refs/changes/1219/head

Code review from 胡传军

* refs/changes/1219/head: (5 commits squashed)

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制,待测试 ,修改BLE打印日志

  - 修改获取全部表盘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/1219
code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
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
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h