Merge #2604 into sdk650pathc0423 from refs/changes/2604/head 2607/target/1 2610/target/1
author胡传军 <1224667075@qq.com>
Sun, 26 Oct 2025 13:03:50 +0000 (13:03 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sun, 26 Oct 2025 13:03:50 +0000 (13:03 +0000)
commitf6a264de73300ebd2488ddb1e645dd10eaa8411a
tree4e7ee62bfcce46e6c63273203d48501a44f4187b
parent45295b2bce26192771c092c6d5027936b7395039
Merge #2604 into sdk650pathc0423 from refs/changes/2604/head

Code review from 胡传军

* refs/changes/2604/head: (14 commits squashed)

  - 增加优化 EG810 雷鸟对话

  - 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

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

  - 修改雷鸟 播放卡顿问题

  - sos修改

  - 合并

  - 修改 cat1 python的tcp控制逻辑

  - 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

  - 增加cat1升级服务

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

  - 增加vad 雷鸟对话,仅可自动结束

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/2604
code/sdk/zhihui/4g/cat1Service/CMakeLists.txt
code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c
code/sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c
code/sdk/zhihui/4g/cat1Service/include/cat1_server.h
code/sdk/zhihui/4g/cat1Service/include/cat1_tcpServer.h
code/sdk/zhihui/leiniao/imsl_ln/ln_api.h
code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c