From 2cc70b0ca31370f5dfa99686e668744b09d5b634 Mon Sep 17 00:00:00 2001 From: KremeCN <3265494849@qq.com> Date: Tue, 25 Aug 2026 14:49:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(infrared):=20correct=20default=20device=20n?= =?UTF-8?q?ame=20from=20ir-1=20to=20=E7=BA=A2=E5=A4=96=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flagship/abox/manager/infrared/hub/InfraredHubUiState.kt | 2 +- .../flagship/abox/manager/infrared/hub/InfraredHubViewModel.kt | 2 +- .../abox/manager/infrared/remote/InfraredRemoteViewModel.kt | 2 +- .../flagship/abox/manager/infrared/ui/InfraredControlScreen.kt | 2 +- .../flagship/abox/manager/infrared/ui/InfraredControlUiState.kt | 2 +- .../abox/manager/infrared/ui/InfraredControlViewModel.kt | 2 +- android/feature/infrared/src/main/res/values-zh-rCN/strings.xml | 2 +- android/feature/infrared/src/main/res/values/strings.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubUiState.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubUiState.kt index 0599c8c..06d10b5 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubUiState.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubUiState.kt @@ -17,7 +17,7 @@ data class InfraredHubUiState( val profileId: ProviderProfileId? = null, val providerType: ProviderType? = null, val providerDisplayName: String? = null, - val savedDeviceName: DeviceName = DeviceName("ir-1"), + val savedDeviceName: DeviceName = DeviceName("红外控制器"), val remotes: List = emptyList(), val slotQuota: SlotQuotaSummary = SlotQuotaSummary(), val loading: Boolean = true, diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubViewModel.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubViewModel.kt index bfdad11..9e69efd 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubViewModel.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/hub/InfraredHubViewModel.kt @@ -195,6 +195,6 @@ class InfraredHubViewModel @Inject constructor( } companion object { - val DEFAULT_DEVICE_NAME = DeviceName("ir-1") + val DEFAULT_DEVICE_NAME = DeviceName("红外控制器") } } diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/remote/InfraredRemoteViewModel.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/remote/InfraredRemoteViewModel.kt index 2e1806c..50057c9 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/remote/InfraredRemoteViewModel.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/remote/InfraredRemoteViewModel.kt @@ -326,6 +326,6 @@ class InfraredRemoteViewModel @Inject constructor( } companion object { - val DEFAULT_DEVICE_NAME = DeviceName("ir-1") + val DEFAULT_DEVICE_NAME = DeviceName("红外控制器") } } diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlScreen.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlScreen.kt index 29bb26b..c9b0674 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlScreen.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlScreen.kt @@ -210,7 +210,7 @@ internal fun InfraredControlScreen( OutlinedTextField( value = state.deviceNameInput, onValueChange = onDeviceNameChanged, - label = { Text("修改设备名(如:ir-1, ir-living)") }, + label = { Text("修改设备名(如:红外控制器)") }, singleLine = true, modifier = Modifier .weight(1f) diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlUiState.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlUiState.kt index 9371ba5..92602dc 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlUiState.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlUiState.kt @@ -17,7 +17,7 @@ data class InfraredControlUiState( val providerType: ProviderType? = null, val providerDisplayName: String? = null, val deviceNameInput: String = "", - val savedDeviceName: DeviceName = DeviceName("ir-1"), + val savedDeviceName: DeviceName = DeviceName("红外控制器"), val slotQuota: SlotQuotaSummary = SlotQuotaSummary(), val totalRemotesCount: Int = 0, val loading: Boolean = true, diff --git a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlViewModel.kt b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlViewModel.kt index 09fa9ea..2d494ac 100644 --- a/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlViewModel.kt +++ b/android/feature/infrared/src/main/kotlin/com/flagship/abox/manager/infrared/ui/InfraredControlViewModel.kt @@ -179,6 +179,6 @@ class InfraredControlViewModel @Inject constructor( } companion object { - val DEFAULT_DEVICE_NAME = DeviceName("ir-1") + val DEFAULT_DEVICE_NAME = DeviceName("红外控制器") } } diff --git a/android/feature/infrared/src/main/res/values-zh-rCN/strings.xml b/android/feature/infrared/src/main/res/values-zh-rCN/strings.xml index 6e086c4..4382170 100644 --- a/android/feature/infrared/src/main/res/values-zh-rCN/strings.xml +++ b/android/feature/infrared/src/main/res/values-zh-rCN/strings.xml @@ -77,7 +77,7 @@ 电视-返回 红外设备与环境配置 ABSDK 设备名称配置 - ABSDK 依靠此设备名称(如 ir-1、ir-living)寻址具体的硬件转发器,请确保名称与主机端保持一致。 + ABSDK 依靠此设备名称(默认为 红外控制器)寻址具体的硬件转发器,请确保名称与主机端保持一致。 当前绑定设备:%1$s 保存修改 硬件槽位与遥控器概览 diff --git a/android/feature/infrared/src/main/res/values/strings.xml b/android/feature/infrared/src/main/res/values/strings.xml index fd8f204..e9a5a6f 100644 --- a/android/feature/infrared/src/main/res/values/strings.xml +++ b/android/feature/infrared/src/main/res/values/strings.xml @@ -79,7 +79,7 @@ TV Menu Device Configuration ABSDK Device Name - ABSDK matches hardware devices by device name (e.g. ir-1, ir-living). Commands will be dispatched to this target device. + ABSDK matches hardware devices by device name (default: 红外控制器). Commands will be dispatched to this target device. Current Bound Device: %1$s Save Changes Hardware Slot Budget