|
|
@@ -359,9 +359,9 @@ namespace SmartBowSDK
|
|
|
if (helper != _bluetoothHelper) return;
|
|
|
foreach (BluetoothDevice device in nearbyDevices)
|
|
|
{
|
|
|
- SmartBowLogger.Log(this, $"发现设备{device.DeviceName},is fileters empty:{ string.IsNullOrEmpty(filters)},name:{filters}");
|
|
|
if (isConnectName)
|
|
|
{
|
|
|
+ SmartBowLogger.Log(this, $"发现设备{device.DeviceName},is fileters empty:{ string.IsNullOrEmpty(filters)},name:{filters}");
|
|
|
//if (device.DeviceName == deviceConfig.deviceName)
|
|
|
//后续匹配名字 可以是多个设备
|
|
|
string _filters = string.IsNullOrEmpty(filters) ? deviceConfig.deviceName : filters;
|
|
|
@@ -375,11 +375,12 @@ namespace SmartBowSDK
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ SmartBowLogger.Log(this, $"发现设备 {device.DeviceAddress},is connectMacStr:{ connectMacStr },DeviceAddress:{device.DeviceAddress}");
|
|
|
//按mac地址匹配
|
|
|
- if (device.DeviceAddress == connectMacStr)
|
|
|
+ if (connectMacStr.Contains(device.DeviceAddress))
|
|
|
{
|
|
|
_bluetoothHelper.setDeviceName(device.DeviceName);
|
|
|
- _bluetoothHelper.setDeviceAddress(connectMacStr);
|
|
|
+ _bluetoothHelper.setDeviceAddress(device.DeviceAddress);
|
|
|
_bluetoothHelper.Connect();
|
|
|
SmartBowLogger.Log(this, $"Mac匹配设备{device.DeviceAddress}");
|
|
|
return;
|