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

Merge pull request #814 from funshine/bug_fix_funshine

Browse Source 
Bug fix test_page.html, 以及TTS_CosyVoiceSiliconflow
This commit is contained in:
hrz
2025-04-15 22:02:19 +08:00
committed by GitHub
parent dc69094f00 289ce3716b
commit 15f5592429
3 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/resources/db/changelog/202504151547.sql
+4
View File
@@ -0,0 +1,4 @@
-- 修正CosyVoiceSiliconflow音色
delete from `ai_tts_voice` where tts_model_id = 'TTS_CosyVoiceSiliconflow';
INSERT INTO `ai_tts_voice` VALUES ('TTS_CosyVoiceSiliconflow0001', 'TTS_CosyVoiceSiliconflow', 'CosyVoice男声', 'FunAudioLLM/CosyVoice2-0.5B:alex', '中文', 'https://example.com/cosyvoice/alex.mp3', NULL, 6, NULL, NULL, NULL, NULL);
INSERT INTO `ai_tts_voice` VALUES ('TTS_CosyVoiceSiliconflow0002', 'TTS_CosyVoiceSiliconflow', 'CosyVoice女声', 'FunAudioLLM/CosyVoice2-0.5B:bella', '中文', 'https://example.com/cosyvoice/bella.mp3', NULL, 6, NULL, NULL, NULL, NULL);
main/xiaozhi-server/test/abbreviated_version/app.js
+7 -3
View File
@@ -992,7 +992,9 @@ function connectToServer() {
if(connectButton.id === "connectButton") { if(connectButton.id === "connectButton") {
connectButton.textContent = '断开'; connectButton.textContent = '断开';
connectButton.onclick = disconnectFromServer; // connectButton.onclick = disconnectFromServer;
connectButton.removeEventListener("click", connectToServer);
connectButton.addEventListener("click", disconnectFromServer);
} }
if(messageInput.id === "messageInput") { if(messageInput.id === "messageInput") {
@@ -1011,7 +1013,9 @@ function connectToServer() {
if(connectButton.id === "connectButton") { if(connectButton.id === "connectButton") {
connectButton.textContent = '连接'; connectButton.textContent = '连接';
connectButton.onclick = connectToServer; // connectButton.onclick = connectToServer;
connectButton.removeEventListener("click", disconnectFromServer);
connectButton.addEventListener("click", connectToServer);
} }
if(messageInput.id === "messageInput") { if(messageInput.id === "messageInput") {
@@ -1175,7 +1179,7 @@ function updateStatus(message, type = 'info') {
// 处理文本消息 // 处理文本消息
function handleTextMessage(message) { function handleTextMessage(message) {
if (message.type === 'hello') { if (message.type === 'hello') {
console.log(`服务器回应：${message.message}`); console.log(`服务器回应：${JSON.stringify(message, null, 2)}`);
} else if (message.type === 'tts') { } else if (message.type === 'tts') {
// TTS状态消息 // TTS状态消息
if (message.state === 'start') { if (message.state === 'start') {
main/xiaozhi-server/test/test_page.html
+37 -19
View File
@@ -475,22 +475,36 @@
// 日志函数 // 日志函数
function log(message, type = 'info') { function log(message, type = 'info') {
const logEntry = document.createElement('div'); // 将消息按换行符分割成多行
logEntry.className = `log-entry log-${type}`; const lines = message.split('\n');
logEntry.textContent = `[${new Date().toLocaleTimeString()}] ${message}`; const now = new Date();
if (type === 'error') { // const timestamp = `[${now.toLocaleTimeString()}] `;
logEntry.style.color = 'red'; const timestamp = `[${now.toLocaleTimeString()}.${now.getMilliseconds().toString().padStart(3, '0')}] `;
} else if (type === 'debug') { // 为每一行创建日志条目
logEntry.style.color = 'gray'; lines.forEach((line, index) => {
return; const logEntry = document.createElement('div');
} else if (type === 'warning') { logEntry.className = `log-entry log-${type}`;
logEntry.style.color = 'orange'; // 如果是第一条日志，显示时间戳
} else if (type === 'success') { const prefix = index === 0 ? timestamp : ' '.repeat(timestamp.length);
logEntry.style.color = 'green'; logEntry.textContent = `${prefix}${line}`;
} else { // logEntry.textContent = `[${new Date().toLocaleTimeString()}] ${message}`;
logEntry.style.color = 'black'; // logEntry.style 保留起始的空格
} logEntry.style.whiteSpace = 'pre';
logContainer.appendChild(logEntry); if (type === 'error') {
logEntry.style.color = 'red';
} else if (type === 'debug') {
logEntry.style.color = 'gray';
return;
} else if (type === 'warning') {
logEntry.style.color = 'orange';
} else if (type === 'success') {
logEntry.style.color = 'green';
} else {
logEntry.style.color = 'black';
}
logContainer.appendChild(logEntry);
});
logContainer.scrollTop = logContainer.scrollHeight; logContainer.scrollTop = logContainer.scrollHeight;
} }
@@ -1153,7 +1167,9 @@
await sendHelloMessage(); await sendHelloMessage();
connectButton.textContent = '断开'; connectButton.textContent = '断开';
connectButton.onclick = disconnectFromServer; connectButton.removeEventListener('click', connectToServer);
connectButton.addEventListener('click', disconnectFromServer);
// connectButton.onclick = disconnectFromServer;
messageInput.disabled = false; messageInput.disabled = false;
sendTextButton.disabled = false; sendTextButton.disabled = false;
@@ -1169,7 +1185,9 @@
connectionStatus.style.color = 'red'; connectionStatus.style.color = 'red';
connectButton.textContent = '连接'; connectButton.textContent = '连接';
connectButton.onclick = connectToServer; connectButton.removeEventListener('click', disconnectFromServer);
connectButton.addEventListener('click', connectToServer);
// connectButton.onclick = connectToServer;
messageInput.disabled = true; messageInput.disabled = true;
sendTextButton.disabled = true; sendTextButton.disabled = true;
recordButton.disabled = true; recordButton.disabled = true;
@@ -1189,7 +1207,7 @@
const message = JSON.parse(event.data); const message = JSON.parse(event.data);
if (message.type === 'hello') { if (message.type === 'hello') {
log(`服务器回应：${message.message}`, 'info'); log(`服务器回应：${JSON.stringify(message, null, 2)}`, 'success');
} else if (message.type === 'tts') { } else if (message.type === 'tts') {
// TTS状态消息 // TTS状态消息
if (message.state === 'start') { if (message.state === 'start') {