修复蓝牙扫描界面不自动扫描的bug

2025-07-14 10:07:07 +08:00
parent 27273ff18d
commit bd5710c040
2 changed files with 102 additions and 93 deletions
--- a/lib/pages/mh_page/device/mht_blueteeth_device_page.dart
+++ b/lib/pages/mh_page/device/mht_blueteeth_device_page.dart
@@ -112,97 +112,105 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
  }

  void _startScanning() async {
-    if (!mounted || isScanning || !mhtBlueToothController.shouldScan.value)
-      return;
+    try {
+      if (!mounted || isScanning || !mhtBlueToothController.shouldScan.value)
+        return;

-    _scanSubscription?.cancel();
-    var bluetoothState = await FlutterBluePlus.isOn;
-    mhtBlueToothController.model.bluetooth = bluetoothState;
-    mhtBlueToothController.updateAll();
-
-    if (!bluetoothState && !_isDialogShowing) {
-      _isDialogShowing = true;
-      mhtBlueToothController.model.blueRawData = [];
-      mhtBlueToothController.model.deviceDataStatus = [];
+      _scanSubscription?.cancel();
+      var bluetoothState = await FlutterBluePlus.isOn;
+      mhtBlueToothController.model.bluetooth = bluetoothState;
      mhtBlueToothController.updateAll();
-      await _showBluetoothNotEnabledDialog();
-      _isDialogShowing = false;
-      return;
-    }

-    if (!isScanning) {
-      setState(() {
-        isScanning = true;
-      });
-
-      await FlutterBluePlus.startScan(timeout: Duration(seconds: 10));
-
-      _scanSubscription = FlutterBluePlus.scanResults.listen((results) {
-        if (!mounted) return;
-
-        final signalThreshold = mhtBlueToothController.model.singal!;
-        final searchKey =
-            mhtBlueToothController.search.value.trim().toLowerCase();
-
-        final filteredResults = results.where((r) {
-          final localName = r.advertisementData.localName;
-          final isTarget = r.rssi > signalThreshold &&
-              isTargetDevice(
-                  localName, widget.deviceType['reg'].cast<String>());
-          if (!isTarget) return false;
-          final name = r.advertisementData.advName.toLowerCase();
-          String macAddress = r.device.remoteId.str;
-          final mac = macAddress.replaceAll(':', '');
-          final search = searchKey.trim().replaceAll(':', '').toLowerCase();
-
-          if (search.isNotEmpty &&
-              !name.contains(search) &&
-              !mac.replaceAll(':', '').toLowerCase().contains(search)) {
-            return false;
-          }
-
-          return true;
-        }).map((r) {
-          return BlueToothDataModel.fromScanResult(
-              r, widget.deviceType['type']?.toInt(),
-              bind: false,
-              name: r.advertisementData.localName,
-              mac: r.device.remoteId.str.replaceAll(':', ''));
-        }).toList();
-
-        final currentDevices = mhtBlueToothController.model.blueRawData ?? [];
-        final newDevices = <BlueToothDataModel>[];
-
-        for (var newDevice in filteredResults) {
-          // 检查设备是否已存在
-          final existingIndex =
-              currentDevices.indexWhere((d) => d.mac == newDevice.mac);
-
-          if (existingIndex >= 0) {
-            // 更新已有设备信息（如信号强度）
-            currentDevices[existingIndex] = newDevice;
-          } else {
-            // 添加新设备
-            newDevices.add(newDevice);
-          }
-        }
-
-        setState(() {
-          mhtBlueToothController.model.blueRawData = [
-            ...currentDevices,
-            ...newDevices
-          ];
-        });
-      });
-
-      await Future.delayed(Duration(seconds: 10));
-      await FlutterBluePlus.stopScan();
-
-      if (mounted) {
-        setState(() {
-          isScanning = false;
-        });
+      if (!bluetoothState && !_isDialogShowing) {
+        _isDialogShowing = true;
+        mhtBlueToothController.model.blueRawData = [];
+        mhtBlueToothController.model.deviceDataStatus = [];
+        mhtBlueToothController.updateAll();
+        await _showBluetoothNotEnabledDialog();
+        _isDialogShowing = false;
+        return;
      }
+
+      if (!isScanning) {
+        setState(() {
+          isScanning = true;
+        });
+
+        await FlutterBluePlus.startScan(timeout: Duration(seconds: 10));
+
+        _scanSubscription = FlutterBluePlus.scanResults.listen((results) {
+          if (!mounted) return;
+
+          final signalThreshold = mhtBlueToothController.model.singal!;
+          final searchKey =
+              mhtBlueToothController.search.value.trim().toLowerCase();
+
+          final filteredResults = results.where((r) {
+            final localName = r.advertisementData.localName;
+            final isTarget = r.rssi > signalThreshold &&
+                isTargetDevice(
+                    localName, widget.deviceType['reg'].cast<String>());
+            if (!isTarget) return false;
+            final name = r.advertisementData.advName.toLowerCase();
+            String macAddress = r.device.remoteId.str;
+            final mac = macAddress.replaceAll(':', '');
+            final search = searchKey.trim().replaceAll(':', '').toLowerCase();
+
+            if (search.isNotEmpty &&
+                !name.contains(search) &&
+                !mac.replaceAll(':', '').toLowerCase().contains(search)) {
+              return false;
+            }
+
+            return true;
+          }).map((r) {
+            return BlueToothDataModel.fromScanResult(
+                r, widget.deviceType['type']?.toInt(),
+                bind: false,
+                name: r.advertisementData.localName,
+                mac: r.device.remoteId.str.replaceAll(':', ''));
+          }).toList();
+
+          final currentDevices = mhtBlueToothController.model.blueRawData ?? [];
+          final newDevices = <BlueToothDataModel>[];
+
+          for (var newDevice in filteredResults) {
+            // 检查设备是否已存在
+            final existingIndex =
+                currentDevices.indexWhere((d) => d.mac == newDevice.mac);
+
+            if (existingIndex >= 0) {
+              // 更新已有设备信息（如信号强度）
+              currentDevices[existingIndex] = newDevice;
+            } else {
+              // 添加新设备
+              newDevices.add(newDevice);
+            }
+          }
+
+          setState(() {
+            mhtBlueToothController.model.blueRawData = [
+              ...currentDevices,
+              ...newDevices
+            ];
+          });
+        });
+
+        await Future.delayed(Duration(seconds: 10));
+        await FlutterBluePlus.stopScan();
+
+        if (mounted) {
+          setState(() {
+            isScanning = false;
+          });
+        }
+      }
+    } catch (e) {
+      ef.log("$e");
+    } finally {
+      setState(() {
+        isScanning = false;         
+      });
    }
  }