feat(app): Wake-Word-Empfindlichkeit + Weiterreden-Fenster in Settings
Fehlauslösung im Auto: Spotify läuft über die Lautsprecher, das Mikro hört mit, openWakeWord halluziniert "computer" rein (Log: wake.detect state=armed → leerer Transkript). Der Echo-Canceler kann nur ARIAs eigenes TTS rausrechnen, nicht Spotify (fremde App, kein Referenzsignal). - Wake-Word-Threshold jetzt konfigurierbar (loadWakeThreshold), Default von 0.5 auf 0.6 hoch (strenger → weniger Fehlauslösung). Slider im Wake-Word- Settings-Bereich (0.30–0.90, greift beim "Speichern + Aktivieren"). - Weiterreden-Fenster (passives Lauschen) als Slider, Default 30s (10–60s). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -105,6 +105,14 @@ import wakeWordService, {
|
|||||||
KEYWORD_LABELS,
|
KEYWORD_LABELS,
|
||||||
DEFAULT_KEYWORD,
|
DEFAULT_KEYWORD,
|
||||||
WAKE_KEYWORD_STORAGE,
|
WAKE_KEYWORD_STORAGE,
|
||||||
|
WAKE_THRESHOLD_DEFAULT,
|
||||||
|
WAKE_THRESHOLD_MIN,
|
||||||
|
WAKE_THRESHOLD_MAX,
|
||||||
|
loadWakeThreshold,
|
||||||
|
saveWakeThreshold,
|
||||||
|
PASSIVE_LISTEN_DEFAULT_MS,
|
||||||
|
loadPassiveListenMs,
|
||||||
|
savePassiveListenMs,
|
||||||
} from '../services/wakeword';
|
} from '../services/wakeword';
|
||||||
import ModeSelector from '../components/ModeSelector';
|
import ModeSelector from '../components/ModeSelector';
|
||||||
import QRScanner from '../components/QRScanner';
|
import QRScanner from '../components/QRScanner';
|
||||||
@@ -200,6 +208,8 @@ const SettingsScreen: React.FC = () => {
|
|||||||
const [wakeKeyword, setWakeKeyword] = useState<string>(DEFAULT_KEYWORD);
|
const [wakeKeyword, setWakeKeyword] = useState<string>(DEFAULT_KEYWORD);
|
||||||
const [wakeStatus, setWakeStatus] = useState<string>('');
|
const [wakeStatus, setWakeStatus] = useState<string>('');
|
||||||
const [wakeReadySound, setWakeReadySound] = useState<boolean>(true);
|
const [wakeReadySound, setWakeReadySound] = useState<boolean>(true);
|
||||||
|
const [wakeThreshold, setWakeThreshold] = useState<number>(WAKE_THRESHOLD_DEFAULT);
|
||||||
|
const [passiveSec, setPassiveSec] = useState<number>(Math.round(PASSIVE_LISTEN_DEFAULT_MS / 1000));
|
||||||
const [editingPath, setEditingPath] = useState(false);
|
const [editingPath, setEditingPath] = useState(false);
|
||||||
const [xttsVoice, setXttsVoice] = useState('');
|
const [xttsVoice, setXttsVoice] = useState('');
|
||||||
const [loadingVoice, setLoadingVoice] = useState<string | null>(null);
|
const [loadingVoice, setLoadingVoice] = useState<string | null>(null);
|
||||||
@@ -322,6 +332,8 @@ const SettingsScreen: React.FC = () => {
|
|||||||
if (saved && (WAKE_KEYWORDS as readonly string[]).includes(saved)) setWakeKeyword(saved);
|
if (saved && (WAKE_KEYWORDS as readonly string[]).includes(saved)) setWakeKeyword(saved);
|
||||||
});
|
});
|
||||||
isWakeReadySoundEnabled().then(setWakeReadySound);
|
isWakeReadySoundEnabled().then(setWakeReadySound);
|
||||||
|
loadWakeThreshold().then(setWakeThreshold).catch(() => {});
|
||||||
|
loadPassiveListenMs().then(ms => setPassiveSec(Math.round(ms / 1000))).catch(() => {});
|
||||||
updateService.getApkCacheSize().then(setApkCacheInfo).catch(() => {});
|
updateService.getApkCacheSize().then(setApkCacheInfo).catch(() => {});
|
||||||
audioService.getTtsCacheSize().then(setTtsCacheInfo).catch(() => {});
|
audioService.getTtsCacheSize().then(setTtsCacheInfo).catch(() => {});
|
||||||
AsyncStorage.getItem('aria_xtts_voice').then(saved => {
|
AsyncStorage.getItem('aria_xtts_voice').then(saved => {
|
||||||
@@ -1862,6 +1874,40 @@ const SettingsScreen: React.FC = () => {
|
|||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
|
<Text style={[styles.toggleLabel, {marginTop: 20}]}>Empfindlichkeit</Text>
|
||||||
|
<Text style={styles.toggleHint}>
|
||||||
|
Wie leicht das Wake-Word anspringt. Hoeher = strenger = weniger
|
||||||
|
Fehlauslösung (z.B. durch Musik/Radio, die das Mikro mithoert — der
|
||||||
|
Echo-Canceler kann nur ARIAs eigene Stimme rausrechnen, nicht Spotify),
|
||||||
|
aber du musst evtl. deutlicher sprechen. Default: {WAKE_THRESHOLD_DEFAULT.toFixed(2)}.
|
||||||
|
Wird beim „Speichern + Aktivieren" uebernommen.
|
||||||
|
</Text>
|
||||||
|
<View style={styles.prerollRow}>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.prerollButton}
|
||||||
|
onPress={() => {
|
||||||
|
const next = Math.max(WAKE_THRESHOLD_MIN, Math.round((wakeThreshold - 0.05) * 100) / 100);
|
||||||
|
setWakeThreshold(next);
|
||||||
|
saveWakeThreshold(next);
|
||||||
|
}}
|
||||||
|
disabled={wakeThreshold <= WAKE_THRESHOLD_MIN}
|
||||||
|
>
|
||||||
|
<Text style={styles.prerollButtonText}>−0.05</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<Text style={styles.prerollValue}>{wakeThreshold.toFixed(2)}</Text>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.prerollButton}
|
||||||
|
onPress={() => {
|
||||||
|
const next = Math.min(WAKE_THRESHOLD_MAX, Math.round((wakeThreshold + 0.05) * 100) / 100);
|
||||||
|
setWakeThreshold(next);
|
||||||
|
saveWakeThreshold(next);
|
||||||
|
}}
|
||||||
|
disabled={wakeThreshold >= WAKE_THRESHOLD_MAX}
|
||||||
|
>
|
||||||
|
<Text style={styles.prerollButtonText}>+0.05</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
|
||||||
<View style={{flexDirection: 'row', gap: 8, marginTop: 16, alignItems: 'center'}}>
|
<View style={{flexDirection: 'row', gap: 8, marginTop: 16, alignItems: 'center'}}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.connectButton, {flex: 1}]}
|
style={[styles.connectButton, {flex: 1}]}
|
||||||
@@ -1907,6 +1953,39 @@ const SettingsScreen: React.FC = () => {
|
|||||||
thumbColor={wakeReadySound ? '#FFFFFF' : '#666680'}
|
thumbColor={wakeReadySound ? '#FFFFFF' : '#666680'}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
|
<Text style={[styles.toggleLabel, {marginTop: 20}]}>Weiterreden-Fenster (Gespraech)</Text>
|
||||||
|
<Text style={styles.toggleHint}>
|
||||||
|
Nach einer gesprochenen ARIA-Antwort kannst du so lange einfach
|
||||||
|
weiterreden — ohne Wake-Word — bevor zurueck aufs Wake-Word geschaltet
|
||||||
|
wird. Reine Steuerbefehle (z.B. „nächster Titel") beenden sofort.
|
||||||
|
Default: {Math.round(PASSIVE_LISTEN_DEFAULT_MS / 1000)}s.
|
||||||
|
</Text>
|
||||||
|
<View style={styles.prerollRow}>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.prerollButton}
|
||||||
|
onPress={() => {
|
||||||
|
const next = Math.max(10, passiveSec - 5);
|
||||||
|
setPassiveSec(next);
|
||||||
|
savePassiveListenMs(next * 1000);
|
||||||
|
}}
|
||||||
|
disabled={passiveSec <= 10}
|
||||||
|
>
|
||||||
|
<Text style={styles.prerollButtonText}>−5</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<Text style={styles.prerollValue}>{passiveSec} s</Text>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.prerollButton}
|
||||||
|
onPress={() => {
|
||||||
|
const next = Math.min(60, passiveSec + 5);
|
||||||
|
setPassiveSec(next);
|
||||||
|
savePassiveListenMs(next * 1000);
|
||||||
|
}}
|
||||||
|
disabled={passiveSec >= 60}
|
||||||
|
>
|
||||||
|
<Text style={styles.prerollButtonText}>+5</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</>)}
|
</>)}
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,30 @@ export async function savePassiveListenMs(ms: number): Promise<void> {
|
|||||||
|
|
||||||
export const WAKE_KEYWORD_STORAGE = 'aria_wake_keyword';
|
export const WAKE_KEYWORD_STORAGE = 'aria_wake_keyword';
|
||||||
|
|
||||||
|
// Wake-Word-Empfindlichkeit (openWakeWord-Threshold). Hoeher = strenger =
|
||||||
|
// weniger Fehlauslösung (z.B. durch Musik/Radio ueber die Auto-Lautsprecher,
|
||||||
|
// die das Mikro mithoert — der App-Echo-Canceler kann nur ARIAs eigenes TTS
|
||||||
|
// rausrechnen, NICHT Spotify). Default 0.6 (war 0.5). 0..1.
|
||||||
|
export const WAKE_THRESHOLD_DEFAULT = 0.6;
|
||||||
|
export const WAKE_THRESHOLD_MIN = 0.3;
|
||||||
|
export const WAKE_THRESHOLD_MAX = 0.9;
|
||||||
|
export const WAKE_THRESHOLD_STORAGE_KEY = 'aria_wake_threshold';
|
||||||
|
|
||||||
|
export async function loadWakeThreshold(): Promise<number> {
|
||||||
|
try {
|
||||||
|
const raw = await AsyncStorage.getItem(WAKE_THRESHOLD_STORAGE_KEY);
|
||||||
|
if (raw != null) {
|
||||||
|
const n = parseFloat(raw);
|
||||||
|
if (isFinite(n) && n >= WAKE_THRESHOLD_MIN && n <= WAKE_THRESHOLD_MAX) return n;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
return WAKE_THRESHOLD_DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function saveWakeThreshold(v: number): Promise<void> {
|
||||||
|
await AsyncStorage.setItem(WAKE_THRESHOLD_STORAGE_KEY, String(v));
|
||||||
|
}
|
||||||
|
|
||||||
/** Verfuegbare Wake-Words — entsprechen den .onnx Dateien in
|
/** Verfuegbare Wake-Words — entsprechen den .onnx Dateien in
|
||||||
* android/app/src/main/assets/openwakeword/. Custom-Keywords (eigenes
|
* android/app/src/main/assets/openwakeword/. Custom-Keywords (eigenes
|
||||||
* Training via openwakeword Notebook) muessen aktuell als Asset eingebaut
|
* Training via openwakeword Notebook) muessen aktuell als Asset eingebaut
|
||||||
@@ -76,8 +100,9 @@ export const KEYWORD_LABELS: Record<WakeKeyword, string> = {
|
|||||||
hey_rhasspy: 'Hey Rhasspy',
|
hey_rhasspy: 'Hey Rhasspy',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Detection-Tuning — kann in Settings spaeter konfigurierbar werden.
|
// Detection-Tuning. Threshold ist ueber die Settings konfigurierbar
|
||||||
const DEFAULT_THRESHOLD = 0.5;
|
// (loadWakeThreshold) — der Wert hier ist nur der Fallback.
|
||||||
|
const DEFAULT_THRESHOLD = WAKE_THRESHOLD_DEFAULT;
|
||||||
const DEFAULT_PATIENCE = 2;
|
const DEFAULT_PATIENCE = 2;
|
||||||
const DEFAULT_DEBOUNCE_MS = 1500;
|
const DEFAULT_DEBOUNCE_MS = 1500;
|
||||||
|
|
||||||
@@ -197,7 +222,9 @@ class WakeWordService {
|
|||||||
if (this.initInProgress) return this.initInProgress;
|
if (this.initInProgress) return this.initInProgress;
|
||||||
this.initInProgress = (async () => {
|
this.initInProgress = (async () => {
|
||||||
try {
|
try {
|
||||||
await OpenWakeWord.init(this.keyword, DEFAULT_THRESHOLD, DEFAULT_PATIENCE, DEFAULT_DEBOUNCE_MS);
|
const threshold = await loadWakeThreshold();
|
||||||
|
console.log('[WakeWord] init mit threshold=%s', threshold);
|
||||||
|
await OpenWakeWord.init(this.keyword, threshold, DEFAULT_PATIENCE, DEFAULT_DEBOUNCE_MS);
|
||||||
// Subscribe nur einmal
|
// Subscribe nur einmal
|
||||||
if (!this.eventSub) {
|
if (!this.eventSub) {
|
||||||
const emitter = new NativeEventEmitter(NativeModules.OpenWakeWord);
|
const emitter = new NativeEventEmitter(NativeModules.OpenWakeWord);
|
||||||
|
|||||||
Reference in New Issue
Block a user