Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-27 17:43:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into update-theme

Browse Source
This commit is contained in:
zhuoqinglian
2026-06-18 10:26:57 +08:00
parent 89a1229b53 071ed99a32
commit 211cf891af
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-web/src/views/AddressBookManagement.vue
+2 -2
View File
@@ -282,7 +282,7 @@ export default {
remarks: device.alias || '', remarks: device.alias || '',
online: false, online: false,
createDate: device.createDate, createDate: device.createDate,
lastConnectedAt: device.lastConnectedAt, lastConnectedAt: device.lastConnectedAtTimestamp,
deviceStatus: 'offline' deviceStatus: 'offline'
})); }));
resolve(); resolve();
@@ -529,7 +529,7 @@ export default {
getTimeAgo(timestamp) { getTimeAgo(timestamp) {
if (!timestamp) return '-'; if (!timestamp) return '-';
const now = new Date(); const now = new Date();
const date = new Date(timestamp); const date = new Date(Number(timestamp));
const diff = now - date; const diff = now - date;
const seconds = Math.floor(diff / 1000); const seconds = Math.floor(diff / 1000);
main/xiaozhi-server/core/handle/textHandler/listenMessageHandler.py
+17 -4
View File
@@ -36,6 +36,10 @@ class ListenTextMessageHandler(TextMessageHandler):
# 设备从播放模式切回录音模式,清除所有音频状态和缓冲区 # 设备从播放模式切回录音模式,清除所有音频状态和缓冲区
conn.reset_audio_states() conn.reset_audio_states()
elif msg_json["state"] == "stop": elif msg_json["state"] == "stop":
# 收到stop但asr未初始化，跳过处理
if conn.asr is None:
return
conn.client_voice_stop = True conn.client_voice_stop = True
if conn.asr.interface_type == InterfaceType.STREAM: if conn.asr.interface_type == InterfaceType.STREAM:
# 流式模式下，发送结束请求 # 流式模式下，发送结束请求
@@ -71,10 +75,19 @@ class ListenTextMessageHandler(TextMessageHandler):
conn.sentence_id = uuid.uuid4().hex conn.sentence_id = uuid.uuid4().hex
await send_stt_message(conn, call_text) await send_stt_message(conn, call_text)
conn.tts.store_tts_text(conn.sentence_id, call_text)
conn.tts.tts_text_queue.put(TTSMessageDTO(sentence_id=conn.sentence_id, sentence_type=SentenceType.FIRST, content_type=ContentType.ACTION)) # 等待tts初始化，最多等待3秒
conn.tts.tts_one_sentence(conn, ContentType.TEXT, content_detail=call_text) start_time = time.time()
conn.tts.tts_text_queue.put(TTSMessageDTO(sentence_id=conn.sentence_id, sentence_type=SentenceType.LAST, content_type=ContentType.ACTION)) while time.time() - start_time < 3:
if conn.tts:
break
await asyncio.sleep(0.1)
if conn.tts:
conn.tts.store_tts_text(conn.sentence_id, call_text)
conn.tts.tts_text_queue.put(TTSMessageDTO(sentence_id=conn.sentence_id, sentence_type=SentenceType.FIRST, content_type=ContentType.ACTION))
conn.tts.tts_one_sentence(conn, ContentType.TEXT, content_detail=call_text)
conn.tts.tts_text_queue.put(TTSMessageDTO(sentence_id=conn.sentence_id, sentence_type=SentenceType.LAST, content_type=ContentType.ACTION))
# 添加到对话历史，让模型理解上下文 # 添加到对话历史，让模型理解上下文
conn.dialogue.put(Message(role="assistant", content=call_text)) conn.dialogue.put(Message(role="assistant", content=call_text))