Merge #1639 into sdk602patch0911 from refs/changes/1639/head
author胡传军 <1224667075@qq.com>
Sat, 18 Jan 2025 09:31:57 +0000 (09:31 +0000)
committer袁清梦 <3449750381@qq.com>
Sat, 18 Jan 2025 09:31:57 +0000 (09:31 +0000)
commit4b3433a3fc6f3345b3c739d74066c03a2e734265
tree05b764ea37cf851a8d47c3c1de2758088b938267
parent411a8d6557d0ec21e4d96cf1e3b855d2a2dfc069
Merge #1639 into sdk602patch0911 from refs/changes/1639/head

Code review from 胡传军

* refs/changes/1639/head: (4 commits squashed)

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

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

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

  - 修改电话语言提示

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/1639
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp