From c3a41e424d4c5eecaa02a438bd34e92373724bb8 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Sat, 27 Sep 2025 11:52:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/core/translations/language/zh_cn.dart | 2 +- lib/modules/pairing/controllers/pairing_controller.dart | 2 +- lib/modules/pairing/views/pairing_view.dart | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/core/translations/language/zh_cn.dart b/lib/core/translations/language/zh_cn.dart index aa5d27a9b..d41a69255 100644 --- a/lib/core/translations/language/zh_cn.dart +++ b/lib/core/translations/language/zh_cn.dart @@ -960,7 +960,7 @@ const Map zhCN = { "pairingSuccessRedirecting": "配对成功！即将跳转到主页...", // 配对错误状态文本 - "ensureConnectedDeepSoundDevice": "请确保连接的是Voitrans设备", + "ensureConnectedDeepSoundDevice": "当前使用设备:%s,请确保连接的是Voitrans支持的设备", "deviceAlreadyBoundToOtherAccount": "该设备已被其他账号绑定", "deviceAssociationFailed": "设备关联失败，请重试", "scanTimeoutEnsureDeviceNearby": "扫描超时，请确保设备在附近", diff --git a/lib/modules/pairing/controllers/pairing_controller.dart b/lib/modules/pairing/controllers/pairing_controller.dart index 60543dc64..e8c168807 100644 --- a/lib/modules/pairing/controllers/pairing_controller.dart +++ b/lib/modules/pairing/controllers/pairing_controller.dart @@ -837,7 +837,7 @@ class PairingController extends GetxController with WidgetsBindingObserver { } print( '获取到 deviceName: $deviceName address: ${device.address} uuids:$uuids'); - if (names.contains(deviceName)) { + if (names.any((name) => name.contains(deviceName))) { if (currentBleState == 2) { //已连接直接返回 return 9; diff --git a/lib/modules/pairing/views/pairing_view.dart b/lib/modules/pairing/views/pairing_view.dart index fcefe06a4..2a0a21ee5 100644 --- a/lib/modules/pairing/views/pairing_view.dart +++ b/lib/modules/pairing/views/pairing_view.dart @@ -492,7 +492,8 @@ class _PairingViewState extends State return 'connectDeepSoundViaSystemBluetooth' .tr; // 请先通过系统蓝牙连接Voitrans设备 case ErrorType.deviceNotMatch: - return 'ensureConnectedDeepSoundDevice'.tr; // 请确保连接的是Voitrans设备 + return 'ensureConnectedDeepSoundDevice'.tr.trArgs( + [controller.currentDevice?.name ?? '']); // 请确保连接的是Voitrans设备 case ErrorType.deviceBound: return 'deviceAlreadyBoundToOtherAccount'.tr; // 该设备已被其他账号绑定 case ErrorType.associationFailed: