Merge #1637 into sdk602patch0911 from refs/changes/1637/head 1638/target/1
author胡传军 <1224667075@qq.com>
Sat, 18 Jan 2025 08:14:21 +0000 (08:14 +0000)
committer袁清梦 <3449750381@qq.com>
Sat, 18 Jan 2025 08:14:21 +0000 (08:14 +0000)
commit4e5b485ca305571536eb891f2a6c50418419977b
tree463ac9fa71634d5f89cec737dec5fef85d5423a0
parent81dae4222e0d9f894f1e76136ff5eeb52b7717a6
Merge #1637 into sdk602patch0911 from refs/changes/1637/head

cat1电话使用蓝牙接听,修改为不允许中途直接操作蓝牙,仅控制SCO链路

* refs/changes/1637/head: (2 commits squashed)

  - cat1电话使用蓝牙接听,修改为不允许中途直接操作蓝牙,仅控制SCO链路

  - cat耳机操作 增加语言区别

Signed-off-by: aliyun8003852482 <1224667075@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/1637
13 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAGService.h
code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneServiceC.h
code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAGService.cpp
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
code/sdk/drivers/peripheral/utils/custom_cmd_service.c
code/sdk/drivers/peripheral/utils/custom_utils.h