diff --git a/main/xiaozhi-server/test/js/config/manager.js b/main/xiaozhi-server/test/js/config/manager.js index 9bc33122..e3d31843 100644 --- a/main/xiaozhi-server/test/js/config/manager.js +++ b/main/xiaozhi-server/test/js/config/manager.js @@ -58,10 +58,9 @@ export function saveConfig() { // 获取配置值 export function getConfig() { - // 从DOM获取值 - const deviceMac = document.getElementById('deviceMac')?.value.trim() || ''; - const deviceName = document.getElementById('deviceName')?.value.trim() || ''; - const clientId = document.getElementById('clientId')?.value.trim() || ''; + const deviceMac = localStorage.getItem('xz_tester_deviceMac'); + const deviceName = localStorage.getItem('xz_tester_deviceName'); + const clientId = localStorage.getItem('xz_tester_clientId'); return { deviceId: deviceMac, // 使用MAC地址作为deviceId diff --git a/main/xiaozhi-server/test/js/core/network/ota-connector.js b/main/xiaozhi-server/test/js/core/network/ota-connector.js index 2372c767..e254887a 100644 --- a/main/xiaozhi-server/test/js/core/network/ota-connector.js +++ b/main/xiaozhi-server/test/js/core/network/ota-connector.js @@ -83,7 +83,7 @@ async function sendOTA(otaUrl, config) { }, ota: { label: 'xiaozhi-web-test' }, board: { - type: 'xiaozhi-web-test', + type: config.deviceName, ssid: 'xiaozhi-web-test', rssi: 0, channel: 0, diff --git a/main/xiaozhi-server/test/js/ui/controller.js b/main/xiaozhi-server/test/js/ui/controller.js index 1d22f32f..664e27c2 100644 --- a/main/xiaozhi-server/test/js/ui/controller.js +++ b/main/xiaozhi-server/test/js/ui/controller.js @@ -152,8 +152,12 @@ class UIController { const closeButtons = document.querySelectorAll('.close-btn'); closeButtons.forEach(btn => { btn.addEventListener('click', (e) => { + e.stopPropagation(); const modal = e.target.closest('.modal'); if (modal) { + if (modal.id === 'settingsModal') { + saveConfig(); + } this.hideModal(modal.id); } }); @@ -172,23 +176,19 @@ class UIController { modals.forEach(modal => { modal.addEventListener('click', (e) => { if (e.target === modal) { + if (modal.id === 'settingsModal') { + saveConfig(); + } this.hideModal(modal.id); } }); }); - // 保存配置按钮 - const saveConfigBtn = document.getElementById('saveConfigBtn'); - if (saveConfigBtn) { - saveConfigBtn.addEventListener('click', () => { - this.saveConfig(); - }); - } - // 添加MCP工具按钮 const addMCPToolBtn = document.getElementById('addMCPToolBtn'); if (addMCPToolBtn) { - addMCPToolBtn.addEventListener('click', () => { + addMCPToolBtn.addEventListener('click', (e) => { + e.stopPropagation(); this.addMCPTool(); }); } @@ -330,23 +330,6 @@ class UIController { } } - // 保存配置 - saveConfig() { - const config = { - serverUrl: document.getElementById('serverUrl').value, - serverPort: document.getElementById('serverPort').value, - audioDevice: document.getElementById('audioDevice').value, - audioSampleRate: document.getElementById('audioSampleRate').value, - audioChannels: document.getElementById('audioChannels').value - }; - - saveConfig(config); - this.hideModal('settingsModal'); - - // 显示保存成功消息 - this.addChatMessage('配置已保存', false); - } - // 连接成功后开始对话 startAIChatSession() { this.addChatMessage('连接成功,开始聊天吧~🙂', false); diff --git a/main/xiaozhi-server/test/test_page.html b/main/xiaozhi-server/test/test_page.html index e92a3ea9..9a3bf04e 100644 --- a/main/xiaozhi-server/test/test_page.html +++ b/main/xiaozhi-server/test/test_page.html @@ -133,7 +133,7 @@