Merge #1814 into sdk602patch0911 from refs/changes/1814/head 1816/target/1 1819/target/1
author胡传军 <1224667075@qq.com>
Sat, 7 Jun 2025 11:01:11 +0000 (11:01 +0000)
committer袁清梦 <3449750381@qq.com>
Sat, 7 Jun 2025 11:01:11 +0000 (11:01 +0000)
commit133270f69ee86fc7a6ee0067f1aade3059b04c96
treeb09729180f08a99ccf07a9b67709ba67b5928d97
parent847ddc695b6bf210baaa84aa25e76ddc891532e1
Merge #1814 into sdk602patch0911 from refs/changes/1814/head

Code review from 胡传军

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

  - 增加4Gai对话,待联调,且处于测试用服务器

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

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

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

  - 增加tts服务,增加ai接口

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/1814
15 files changed:
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt
code/sdk/drivers/peripheral/slip/cat1Service/bk_websocket.h
code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp
code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp
code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h
code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.h [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/http_cat1.cpp [new file with mode: 0644]
code/sdk/kernel/liteos/liteos_v207.1.0/Huawei_LiteOS/tools/build/config/brandy.config
code/sdk/middleware/services/media/foundation/sample/wrapper/audio_capture_wrapper.cpp
code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp
code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.h
code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c
code/sdk/open_source/openharmony/third_party/lwip/src/include/lwip/apps/http_client.h