mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-09-13 02:54:26 +08:00
Merge branch 'main' into dev
# Conflicts: # src/web/handlers/setup.rs # web/src/i18n/en-US.ts # web/src/i18n/zh-CN.ts
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
||||
authApi,
|
||||
configApi,
|
||||
otgNetworkApi,
|
||||
uacApi,
|
||||
hidApi,
|
||||
streamApi,
|
||||
atxConfigApi,
|
||||
@@ -682,6 +683,7 @@ const config = ref({
|
||||
turn_server: '',
|
||||
turn_username: '',
|
||||
turn_password: '',
|
||||
uac_enabled: false,
|
||||
})
|
||||
|
||||
const otgNetworkInterfaces = ref<NetworkInterfaceInfo[]>([])
|
||||
@@ -1477,6 +1479,12 @@ async function saveConfig() {
|
||||
},
|
||||
})
|
||||
otgNetworkStatus.value = response.status
|
||||
|
||||
await uacApi.update({
|
||||
enabled: otgEnabled && config.value.uac_enabled,
|
||||
sample_rate: 48000,
|
||||
channels: 2,
|
||||
})
|
||||
}
|
||||
|
||||
if (activeSection.value !== 'hid') {
|
||||
@@ -1497,7 +1505,7 @@ async function saveConfig() {
|
||||
|
||||
async function loadConfig() {
|
||||
try {
|
||||
const [video, stream, hid, msd, otgNetwork] = await Promise.all([
|
||||
const [video, stream, hid, msd, otgNetwork, uac] = await Promise.all([
|
||||
configStore.refreshVideo(),
|
||||
configStore.refreshStream(),
|
||||
configStore.refreshHid(),
|
||||
@@ -1509,6 +1517,7 @@ async function loadConfig() {
|
||||
host_mac: '',
|
||||
device_mac: '',
|
||||
})),
|
||||
uacApi.get().catch(() => ({ enabled: false, sample_rate: 48000, channels: 2 })),
|
||||
])
|
||||
|
||||
config.value = {
|
||||
@@ -1534,6 +1543,7 @@ async function loadConfig() {
|
||||
msd_dir: msd.msd_dir || '',
|
||||
otg_network_enabled: otgNetwork.enabled,
|
||||
otg_network_driver: otgNetwork.driver_mode,
|
||||
uac_enabled: uac.enabled,
|
||||
otg_network_interface: otgNetwork.bridge_interface,
|
||||
encoder_backend: stream.encoder || 'auto',
|
||||
stun_server: stream.stun_server || '',
|
||||
@@ -3364,6 +3374,15 @@ watch(isWindows, () => {
|
||||
{{ t('settings.otgRuntimeDegraded') }}: {{ otgNetworkStatus.error || t('common.error') }}
|
||||
</p>
|
||||
</div>
|
||||
<div class="space-y-3 rounded-md border border-border/60 p-3">
|
||||
<div class="flex items-center justify-between gap-4">
|
||||
<div>
|
||||
<Label>{{ t('settings.uacMic') }}</Label>
|
||||
<p class="text-xs text-muted-foreground">{{ t('settings.uacMicDesc') }}</p>
|
||||
</div>
|
||||
<Switch v-model="config.uac_enabled" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-xs text-warning">
|
||||
{{ t('settings.otgProfileWarning') }}
|
||||
|
||||
Reference in New Issue
Block a user