Snicker Git - mirrors/FD230.git/commit

author	胡传军 <1224667075@qq.com>
	Thu, 25 Sep 2025 11:18:46 +0000 (11:18 +0000)
committer	snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
	Thu, 25 Sep 2025 11:18:46 +0000 (11:18 +0000)
commit	faf071058942441bc670aa4400a06cf0f6f78519
tree	3bf76b20f1caba25dfe5deb62d603f5a8729af92	tree \| snapshot
parent	dd6bd3ff3e2858eea67bc3a91763c77789169d34	commit \| diff

Merge #2391 into sdk650pathc0423 from refs/changes/2391/head

Code review from 胡传军

* refs/changes/2391/head: (3 commits squashed)

  - 修复因多线程操作导致的多次播放重复文字问题（增加锁保护）

  - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423

  - 增加haisi websocket接口增加ai2.5接口

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/2391

22 files changed:

code/sdk/application/brandy/brandy_standard/service_init.c		diff \| blob \| history
code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libwebsocket.a		diff \| blob \| history
code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libwebsocket.a		diff \| blob \| history
code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js/libwebsocket.a		diff \| blob \| history
code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/netstack/websocket/include/net_websocket_type.h		diff \| blob \| history
code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/websocket/websocket_module.cpp		diff \| blob \| history
code/sdk/zhihui/CMakeLists.txt		diff \| blob \| history
code/sdk/zhihui/ai/include/ai_media.h		diff \| blob \| history
code/sdk/zhihui/ai/media/ai_media_service_ext.cpp		diff \| blob \| history
code/sdk/zhihui/ai/src/ai_connection_manager.c		diff \| blob \| history
code/sdk/zhihui/ai_new/CMakeLists.txt	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_new/ai_V2.5/CMakeLists.txt	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_new/ai_V2.5/ai_V2_5_api.h	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_new/ai_V2.5/ai_V2_5_at_cmd.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_new/ai_V2.5/ai_V2_5_at_cmd.h	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_new/ai_V2.5/ai_v2_5_main.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_old/zhihui_ws.cpp		diff \| blob \| history
code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c		diff \| blob \| history
code/sdk/zhihui/websocket/CMakeLists.txt		diff \| blob \| history
code/sdk/zhihui/websocket/os_ws/haisi_websocket.c	[new file with mode: 0644]	blob
code/sdk/zhihui/websocket/os_ws/haisi_websocket.h	[new file with mode: 0644]	blob
code/sdk/zhihui/websocket/src/zhihui_websocket.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom