Merge #2695 into sdk650pathc0423 from refs/changes/2695/head 2742/target/1
author胡传军 <1224667075@qq.com>
Fri, 14 Nov 2025 02:59:31 +0000 (02:59 +0000)
committeraliyun3243248791 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Fri, 14 Nov 2025 02:59:31 +0000 (02:59 +0000)
commitf122e0f59b2aa4ac37f203458ac7d678901fdd84
tree60c625048bda5630d1b6e1032fa40644ee5dcdc9
parente52beb884c2003b2b066f672e06184bf910e6976
Merge #2695 into sdk650pathc0423 from refs/changes/2695/head

Code review from 胡传军

* refs/changes/2695/head: (9 commits squashed)

  - 协议内容修改

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

  - 650入库修改

  - 650入库修改

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

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

  - lnppp版本vad增加

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

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

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2695
14 files changed:
code/sdk/application/brandy/brandy_standard/service_init.c
code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c
code/sdk/zhihui/ai_old/websocket_server_example.cpp
code/sdk/zhihui/config/include/ConfigModel.h
code/sdk/zhihui/config/include/ConfigModelC.h
code/sdk/zhihui/config/src/ConfigModel.cpp
code/sdk/zhihui/dmp/dmp_dev_authentication.c
code/sdk/zhihui/imsl/CMakeLists.txt
code/sdk/zhihui/imsl/src/vad_server.c
code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
code/sdk/zhihui/utils/custom_utils.c