Skip to content

Commit

Permalink
fix some connection problems
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ficat
Ficat committed Nov 19, 2018
1 parent faa1e80 commit 73c528b
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 132 deletions.
258 changes: 138 additions & 120 deletions easyble/src/main/java/com/ficat/easyble/gatt/BleGattImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,128 +77,120 @@ public BleGattImpl(@NonNull Context context) {
@Override
public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
super.onConnectionStateChange(gatt, status, newState);
String address = gatt.getDevice().getAddress();
Map.Entry<BleDevice, BleConnectCallback> entry = findMapEntry(mConnectCallbackMap, address);
if (entry == null) {
return;
}
final BleConnectCallback callback = entry.getValue();
final BleDevice device = entry.getKey();
switch (newState) {
case BluetoothProfile.STATE_CONNECTED:
//start discovering services, only services are found do we deem
//connection is successful
gatt.discoverServices();
break;
case BluetoothProfile.STATE_DISCONNECTED:
device.connected = false;
gatt.close();
removeDevice(device);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onDisconnected(device);
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
Map.Entry<BleDevice, BleConnectCallback> entry = findMapEntry(mConnectCallbackMap, address);
if (entry == null) {
return;
}
final BleConnectCallback callback = entry.getValue();
final BleDevice device = entry.getKey();
switch (newState) {
case BluetoothProfile.STATE_CONNECTED:
//start discovering services, only services are found do we deem
//connection is successful
gatt.discoverServices();
break;
case BluetoothProfile.STATE_DISCONNECTED:
device.connected = false;
refreshDeviceCache(gatt);
gatt.close();
removeDevice(device);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onDisconnected(device);
}
}
}
});
break;
});
break;
}
}
}

@Override
public void onServicesDiscovered(BluetoothGatt gatt, int status) {
super.onServicesDiscovered(gatt, status);
String address = gatt.getDevice().getAddress();
Map.Entry<BleDevice, BleConnectCallback> entry = findMapEntry(mConnectCallbackMap, address);
if (entry == null) {
return;
}

final Map<ServiceInfo, List<CharacteristicInfo>> servicesInfoMap = new HashMap<>();
List<BluetoothGattService> gattServices = gatt.getServices();
for (BluetoothGattService service : gattServices) {
String uuid = service.getUuid().toString();
ServiceInfo serviceInfo = new ServiceInfo(uuid);
List<CharacteristicInfo> charactInfos = new ArrayList<>();
for (BluetoothGattCharacteristic ch : service.getCharacteristics()) {
String chUuid = ch.getUuid().toString();
boolean readable = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_READ) > 0;
boolean writeable = (ch.getProperties() & (BluetoothGattCharacteristic.PROPERTY_WRITE |
BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) > 0;
boolean notify = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0;
boolean indicate = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_INDICATE) > 0;
CharacteristicInfo charactInfo = new CharacteristicInfo(chUuid, readable, writeable, notify, indicate);
charactInfos.add(charactInfo);
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
Map.Entry<BleDevice, BleConnectCallback> entry = findMapEntry(mConnectCallbackMap, address);
if (entry == null) {
return;
}
servicesInfoMap.put(serviceInfo, charactInfos);
}
mServicesMap.put(address, servicesInfoMap);
List<BluetoothGattService> gattServices = gatt.getServices();
Map<ServiceInfo, List<CharacteristicInfo>> servicesInfoMap = getServiceInfoMap(gattServices);
mServicesMap.put(address, servicesInfoMap);

if (!mConnectedDevices.contains(address)) {
mConnectedDevices.add(address);
}
if (!mConnectedDevices.contains(address)) {
mConnectedDevices.add(address);
}

final BleConnectCallback callback = entry.getValue();
final BleDevice device = entry.getKey();
//remove connection timeout message
mHandler.removeCallbacksAndMessages(address);
device.connected = true;
device.connecting = false;
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onConnected(device);
final BleConnectCallback callback = entry.getValue();
final BleDevice device = entry.getKey();
//remove connection timeout message
mHandler.removeCallbacksAndMessages(address);
device.connected = true;
device.connecting = false;
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onConnected(device);
}
}
}
});
});
}
}

@Override
public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
super.onCharacteristicRead(gatt, characteristic, status);
String address = gatt.getDevice().getAddress();
String serviceUuid = characteristic.getService().getUuid().toString();
String characteristicUuid = characteristic.getUuid().toString();
UuidIdentify identify = getUuidIdentifyFromMap(mReadCallbackMap, address, serviceUuid, characteristicUuid);
if (identify == null) {
return;
}
final BleReadCallback callback = mReadCallbackMap.get(identify);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
final byte[] data = characteristic.getValue();
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onRead(data, device);
}
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
String serviceUuid = characteristic.getService().getUuid().toString();
String characteristicUuid = characteristic.getUuid().toString();
UuidIdentify identify = getUuidIdentifyFromMap(mReadCallbackMap, address, serviceUuid, characteristicUuid);
if (identify == null) {
return;
}
});
final BleReadCallback callback = mReadCallbackMap.get(identify);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
final byte[] data = characteristic.getValue();
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onRead(data, device);
}
}
});
}
}

@Override
public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
super.onCharacteristicWrite(gatt, characteristic, status);
String address = gatt.getDevice().getAddress();
String serviceUuid = characteristic.getService().getUuid().toString();
String characteristicUuid = characteristic.getUuid().toString();
UuidIdentify identify = getUuidIdentifyFromMap(mWrtieCallbackMap, address, serviceUuid, characteristicUuid);
if (identify == null) {
return;
}
final BleWriteCallback callback = mWrtieCallbackMap.get(identify);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
final byte[] data = characteristic.getValue();
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onWrite(data, device);
}
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
String serviceUuid = characteristic.getService().getUuid().toString();
String characteristicUuid = characteristic.getUuid().toString();
UuidIdentify identify = getUuidIdentifyFromMap(mWrtieCallbackMap, address, serviceUuid, characteristicUuid);
if (identify == null) {
return;
}
});
final BleWriteCallback callback = mWrtieCallbackMap.get(identify);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
final byte[] data = characteristic.getValue();
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onWrite(data, device);
}
}
});
}
}

@Override
Expand Down Expand Up @@ -251,33 +243,37 @@ public void run() {
@Override
public void onReadRemoteRssi(BluetoothGatt gatt, final int rssi, int status) {
super.onReadRemoteRssi(gatt, rssi, status);
String address = gatt.getDevice().getAddress();
final BleRssiCallback callback = mRssiCallbackMap.get(address);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onRssi(rssi, device);
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
final BleRssiCallback callback = mRssiCallbackMap.get(address);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onRssi(rssi, device);
}
}
}
});
});
}
}

@Override
public void onMtuChanged(BluetoothGatt gatt, final int mtu, int status) {
super.onMtuChanged(gatt, mtu, status);
String address = gatt.getDevice().getAddress();
final BleMtuCallback callback = mMtuCallbackMap.get(address);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onMtuChanged(mtu, device);
if (status == BluetoothGatt.GATT_SUCCESS) {
String address = gatt.getDevice().getAddress();
final BleMtuCallback callback = mMtuCallbackMap.get(address);
final BleDevice device = getBleDeviceFromMap(address, mConnectCallbackMap);
mHandler.post(new Runnable() {
@Override
public void run() {
if (callback != null) {
callback.onMtuChanged(mtu, device);
}
}
}
});
});
}
}
};

Expand Down Expand Up @@ -338,6 +334,7 @@ public void run() {
@Override
public void run() {
device.connecting = false;
refreshDeviceCache(gatt);
gatt.close();
mGattMap.remove(device.address);
if (callback != null) {
Expand Down Expand Up @@ -367,7 +364,7 @@ public void disconnect(String address) {
return;
}
gatt.disconnect();
// refreshDeviceCache(gatt);
refreshDeviceCache(gatt);
gatt.close();
//remove connection timeout message if a connection attempt currently is in progress
mHandler.removeCallbacksAndMessages(address);
Expand Down Expand Up @@ -752,6 +749,27 @@ private <T> UuidIdentify getUuidIdentifyFromMap(Map<UuidIdentify, T> map, String
return null;
}

private Map<ServiceInfo, List<CharacteristicInfo>> getServiceInfoMap(List<BluetoothGattService> gattServices) {
Map<ServiceInfo, List<CharacteristicInfo>> servicesInfoMap = new HashMap<>();
for (BluetoothGattService service : gattServices) {
String uuid = service.getUuid().toString();
ServiceInfo serviceInfo = new ServiceInfo(uuid);
List<CharacteristicInfo> charactInfos = new ArrayList<>();
for (BluetoothGattCharacteristic ch : service.getCharacteristics()) {
String chUuid = ch.getUuid().toString();
boolean readable = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_READ) > 0;
boolean writeable = (ch.getProperties() & (BluetoothGattCharacteristic.PROPERTY_WRITE |
BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) > 0;
boolean notify = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0;
boolean indicate = (ch.getProperties() & BluetoothGattCharacteristic.PROPERTY_INDICATE) > 0;
CharacteristicInfo charactInfo = new CharacteristicInfo(chUuid, readable, writeable, notify, indicate);
charactInfos.add(charactInfo);
}
servicesInfoMap.put(serviceInfo, charactInfos);
}
return servicesInfoMap;
}

private void removeDevice(BleDevice device) {
mConnectCallbackMap.remove(device);
mMtuCallbackMap.remove(device.address);
Expand Down
10 changes: 5 additions & 5 deletions sample/src/main/java/com/ficat/sample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import com.ficat.easypermissions.Permission;
import com.ficat.easypermissions.RequestSubscriber;
import com.ficat.sample.adapter.ScanDeviceAdapter;
import com.ficat.sample.common.CommonRecyclerViewAdapter;
import com.ficat.sample.adapter.common.CommonRecyclerViewAdapter;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -208,7 +208,7 @@ public void onFinish() {

private void testReadRssi() {
if (manager.getConnectedDevices().size() <= 0) {
Toast.makeText(MainActivity.this, "No connected device", Toast.LENGTH_SHORT).show();
Toast.makeText(MainActivity.this, "No connected devices", Toast.LENGTH_SHORT).show();
return;
}
//we use the first connected device to test
Expand All @@ -228,7 +228,7 @@ public void onFail(int failCode, String info, BleDevice device) {

private void testSetMtu() {
if (manager.getConnectedDevices().size() <= 0) {
Toast.makeText(MainActivity.this, "No connected device", Toast.LENGTH_SHORT).show();
Toast.makeText(MainActivity.this, "No connected devices", Toast.LENGTH_SHORT).show();
return;
}
//we use the first connected device to test
Expand All @@ -249,7 +249,7 @@ public void onFail(int failCode, String info, BleDevice device) {

private void testWrite() {
if (manager.getConnectedDevices().size() <= 0) {
Toast.makeText(MainActivity.this, "No connected device", Toast.LENGTH_SHORT).show();
Toast.makeText(MainActivity.this, "No connected devices", Toast.LENGTH_SHORT).show();
return;
}
//we use the first connected device to test
Expand All @@ -274,7 +274,7 @@ public void onFail(int failCode, String info, BleDevice device) {

private void testNotify() {
if (manager.getConnectedDevices().size() <= 0) {
Toast.makeText(MainActivity.this, "No connected device", Toast.LENGTH_SHORT).show();
Toast.makeText(MainActivity.this, "No connected devices", Toast.LENGTH_SHORT).show();
return;
}
//we use the first connected device to test
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/ficat/sample/adapter/ScanDeviceAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import com.ficat.easyble.BleDevice;
import com.ficat.sample.R;
import com.ficat.sample.common.CommonRecyclerViewAdapter;
import com.ficat.sample.adapter.common.CommonRecyclerViewAdapter;

import java.util.List;

Expand Down
Loading

0 comments on commit 73c528b

Please sign in to comment.