From 1ba3508e55894acbf98c20b8969bd1428128015d Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Sat, 27 Sep 2025 15:56:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pairing/controllers/pairing_controller.dart | 10 ++++------ .../yunqiinnovation/ble_service/BleServicePlugin.kt | 4 ++++ local_plugins/ble_service/lib/ble_service.dart | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/modules/pairing/controllers/pairing_controller.dart b/lib/modules/pairing/controllers/pairing_controller.dart index 7f124c65f..d3f13b636 100644 --- a/lib/modules/pairing/controllers/pairing_controller.dart +++ b/lib/modules/pairing/controllers/pairing_controller.dart @@ -940,12 +940,10 @@ class PairingController extends GetxController with WidgetsBindingObserver { await Future.delayed(Duration(seconds: 1)); } _bleManager.stopScan(); - if (product != null && product.devicetype != 0) { - //ble设备 必须要扫描到结果 - return 0; - } else { - return 1; - } + // if (product != null && product.devicetype != 1) { + // //ble设备 必须要扫描到结果 + // return 0; + // } } return 0; //可以跳转1 diff --git a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt index edafa1b57..02d4c49d8 100644 --- a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt +++ b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt @@ -315,6 +315,10 @@ class BleServicePlugin : FlutterPlugin, MethodCallHandler, ActivityAware, val connected = BleService.startScan(uuids) result.success(connected) } + "stopScan" -> { + val connected = BleService.stopScan() + result.success(connected) + } "getDeviceInfo" -> { val address = call.argument("address")?:"" val info = BleService.getDeviceInfo(address); diff --git a/local_plugins/ble_service/lib/ble_service.dart b/local_plugins/ble_service/lib/ble_service.dart index 5b0a5e510..deedbc318 100644 --- a/local_plugins/ble_service/lib/ble_service.dart +++ b/local_plugins/ble_service/lib/ble_service.dart @@ -329,7 +329,7 @@ class BleService { /// 断开连接 Future stopScan() async { try { - final result = await _methodChannel.invokeMethod('stopScan'); + final result = await _methodChannel.invokeMethod('stopscan'); return result ?? false; } catch (e) { print('开启扫描ble设备失败: $e'); From 3dbf70c031307f838481673615acad3b57ec9e75 Mon Sep 17 00:00:00 2001 From: fdp <1286779656@qq.com> Date: Sat, 27 Sep 2025 16:31:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dota=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/models/appconfig.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/data/models/appconfig.dart b/lib/data/models/appconfig.dart index fa5cb0922..547cd8fa5 100644 --- a/lib/data/models/appconfig.dart +++ b/lib/data/models/appconfig.dart @@ -49,8 +49,8 @@ class AppConfig { //根据产品名称获取产品配置 static DBProduct? getproduct(String name) { - final foundProduct = - config.products.firstWhere((product) => product.devicename == name); + final foundProduct = config.products + .firstWhere((product) => product.devicename.contains(name)); return foundProduct; } }