From 1af408336880a68fb263c0b8fd27f435f863db28 Mon Sep 17 00:00:00 2001 From: ross <3024454314@qq.com> Date: Mon, 22 Dec 2025 13:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zs/smarthuman/sherpa/VoiceController.kt | 4 ---- .../main/java/com/zs/smarthuman/sherpa/WakeupManager.kt | 7 ++----- app/src/main/java/com/zs/smarthuman/ui/MainActivity.kt | 3 --- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/zs/smarthuman/sherpa/VoiceController.kt b/app/src/main/java/com/zs/smarthuman/sherpa/VoiceController.kt index cbc3c71..cc0782f 100644 --- a/app/src/main/java/com/zs/smarthuman/sherpa/VoiceController.kt +++ b/app/src/main/java/com/zs/smarthuman/sherpa/VoiceController.kt @@ -53,10 +53,6 @@ class VoiceController( var isPlaying = false private set - /** ================= 公共接口 ================= */ - fun initWakeup(keywords: String) { - wakeupManager.initStream(keywords) - } fun acceptAudio(samples: FloatArray) { cachePreBuffer(samples) diff --git a/app/src/main/java/com/zs/smarthuman/sherpa/WakeupManager.kt b/app/src/main/java/com/zs/smarthuman/sherpa/WakeupManager.kt index 4f072f4..c7fcbce 100644 --- a/app/src/main/java/com/zs/smarthuman/sherpa/WakeupManager.kt +++ b/app/src/main/java/com/zs/smarthuman/sherpa/WakeupManager.kt @@ -29,14 +29,11 @@ class WakeupManager( ) kws = KeywordSpotter(assetManager, config) - } - - fun initStream(keywords: String) { - val normalized = keywords.replace("\n", "/").trim() - stream = kws.createStream(normalized) + stream = kws.createStream() ?: error("Failed to create KWS stream") } + /** ⭐ 小爱同学策略:不管播放还是录音,永远喂 */ fun acceptAudio(samples: FloatArray) { val s = stream ?: return diff --git a/app/src/main/java/com/zs/smarthuman/ui/MainActivity.kt b/app/src/main/java/com/zs/smarthuman/ui/MainActivity.kt index c835e1e..21b2034 100644 --- a/app/src/main/java/com/zs/smarthuman/ui/MainActivity.kt +++ b/app/src/main/java/com/zs/smarthuman/ui/MainActivity.kt @@ -189,9 +189,6 @@ class MainActivity : BaseViewModelActivity() }, ) - // 初始化唤醒词 - voiceController?.initWakeup("x iǎo z ì @小智") -// voiceController?.initWakeup("l iàng z ǎi @靓仔") } override fun receivedIMMsg(msg: SingleMessage) {