Snicker Git - mirrors/FD230.git/commit

author	胡传军 <1224667075@qq.com>
	Sat, 13 Sep 2025 10:48:28 +0000 (10:48 +0000)
committer	罗正 <1732036298@qq.com>
	Sat, 13 Sep 2025 10:48:28 +0000 (10:48 +0000)
commit	7553fd2ad36bc740a8cfebc754969bd1972bb3ca
tree	34c825459c698b6e3abafab5f93e8b831e77d905	tree \| snapshot
parent	788a68fb9baae22040faf974ca34ed0821c7a5cd	commit \| diff

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

Code review from 胡传军

* refs/changes/2238/head: (2 commits squashed)

- ai对话提交，有bug待调试，与ui协调有问题

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

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: 罗正 <1732036298@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2238

22 files changed:

code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceModel.cpp		diff \| blob \| history
code/sdk/zhihui/4g/cat1Serviccpp/cat1_UI_hal.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai/include/ai_media.h		diff \| blob \| history
code/sdk/zhihui/ai/media/CMakeLists.txt		diff \| blob \| history
code/sdk/zhihui/ai/media/ai_media_service.cpp		diff \| blob \| history
code/sdk/zhihui/ai/media/ai_media_service_ext.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_old/CMakeLists.txt		diff \| blob \| history
code/sdk/zhihui/ai_old/ai_old_at_cmd.cpp		diff \| blob \| history
code/sdk/zhihui/ai_old/asr_websocket_server.cpp		diff \| blob \| history
code/sdk/zhihui/ai_old/asr_websocket_server.h		diff \| blob \| history
code/sdk/zhihui/ai_old/bk_websocket.h		diff \| blob \| history
code/sdk/zhihui/ai_old/chat_websocket_server.cpp		diff \| blob \| history
code/sdk/zhihui/ai_old/chat_websocket_server.h		diff \| blob \| history
code/sdk/zhihui/ai_old/tts_websocket_server.cpp		diff \| blob \| history
code/sdk/zhihui/ai_old/tts_websocket_server.h		diff \| blob \| history
code/sdk/zhihui/ai_old/websocket_server_example.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_old/websocket_server_manager.cpp	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_old/websocket_server_manager.h	[new file with mode: 0644]	blob
code/sdk/zhihui/ai_old/zhihui_ws.cpp		diff \| blob \| history
code/sdk/zhihui/ai_old/zhihui_ws.h		diff \| blob \| history
code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt		diff \| blob \| history
code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp		diff \| blob \| history

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

RSS Atom