sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

蓝牙控制类修改方法 修复首次添加完锁之后，部分机型开锁提示锁已被重置问题

Browse Source
This commit is contained in:
魏少阳 2024-08-01 11:10:46 +08:00
parent 696a2884d2
commit 0d2dd5f585
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/blue/blue_manage.dart
View File

@ -355,9 +355,14 @@ class BlueManage {
return isExistDevice; return isExistDevice;
} }
Future<void> _connectDevice(List<ScanResult> devicesList, String deviceName, Future<void> _connectDevice(
List<ScanResult> devicesList,
String deviceName,
ConnectStateCallBack connectStateCallBack, ConnectStateCallBack connectStateCallBack,
{bool isAddEquipment = false}) async { {
bool isAddEquipment = false,// 是否是添加设备之前
bool isReconnect = true,// 是否是重连
}) async {
// 判断数组列表里面是否有这个设备 // 判断数组列表里面是否有这个设备
// AppLog.log("devicesList:$devicesList"); // AppLog.log("devicesList:$devicesList");
final int knownDeviceIndex = devicesList.indexWhere((ScanResult d) => final int knownDeviceIndex = devicesList.indexWhere((ScanResult d) =>
@ -385,16 +390,18 @@ class BlueManage {
AppLog.log('调用了停止扫描的方法'); AppLog.log('调用了停止扫描的方法');
await stopScan(); await stopScan();
if ((scanResult.advertisementData.serviceUuids[0].toString()[31] == '0') && if ((scanResult.advertisementData.serviceUuids[0].toString()[31] == '0') && isAddEquipment == false) {
isAddEquipment == false) { // 添加这个判断是因为有些苹果设备或者安卓等性能比较好的设备时，添加完锁之后，锁板未改变为已添加状态之前，就进行了蓝牙连接，导致添加完锁就失败，这里进行了判断，如果第一次连接失败，就清除缓存重新扫描连接
connectStateCallBack(BluetoothConnectionState.disconnected); if(isReconnect == true){
EasyLoading.showToast('该锁已被重置'.tr, duration: 2000.milliseconds); AppLog.log('该锁已被重置, 重新发送扫描命令');
scanDevices.clear(); startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
_connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment, isReconnect: false);
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) { });
_connectDevice(scanDevices, deviceName, connectStateCallBack, }else{
isAddEquipment: isAddEquipment); connectStateCallBack(BluetoothConnectionState.disconnected);
}); EasyLoading.showToast('该锁已被重置'.tr, duration: 2000.milliseconds);
scanDevices.clear();
}
return; return;
} }
//尝试连接设备 //尝试连接设备