dinislage/Bluetooth-LE-Library-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started rewriting the Gatt Screen UI

Browse Source
This commit is contained in:
Alexandros Schillings
2014-04-28 16:42:12 +01:00
parent cf48721d77
commit 131ab06bfb
5 changed files with 550 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sample_app/res/layout/activity_gatt_services.xml
+76 -50
View File
@@ -14,86 +14,112 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="10dp" android:orientation="vertical"
android:orientation="vertical" > android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" >
<LinearLayout <GridLayout
android:id="@+id/deviceInformation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_alignParentTop="true"
android:orientation="horizontal" > android:columnCount="2"
android:useDefaultMargins="true" >
<TextView <TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_device_address" android:text="@string/label_device_address" />
android:textSize="18sp" />
<Space
android:layout_width="5dp"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/device_address" android:id="@+id/device_address"
android:layout_width="match_parent" style="@style/GridLayoutDataTextView" />
android:layout_height="wrap_content"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:orientation="horizontal" >
<TextView <TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_state" android:text="@string/label_state" />
android:textSize="18sp" />
<Space
android:layout_width="5dp"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/connection_state" android:id="@+id/connection_state"
android:layout_width="match_parent" style="@style/GridLayoutDataTextView" />
android:layout_height="wrap_content" </GridLayout>
android:text="@string/disconnected"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout <View
android:id="@+id/upperSepparator"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/deviceInformation"
android:background="@android:color/holo_blue_dark" />
<GridLayout
android:id="@+id/gattInformation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_alignParentBottom="true"
android:orientation="horizontal" > android:columnCount="2"
android:useDefaultMargins="true" >
<TextView <TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_data" android:text="@string/label_uuid" />
android:textSize="18sp" />
<Space
android:layout_width="5dp"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/data_value" android:id="@+id/uuid"
android:layout_width="match_parent" style="@style/GridLayoutDataTextViewMonospace" />
<TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/no_data" android:text="@string/label_desc" />
android:textSize="18sp" />
</LinearLayout> <TextView
android:id="@+id/description"
style="@style/GridLayoutDataTextViewMonospace" />
<TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_as_string" />
<TextView
android:id="@+id/data_as_string"
style="@style/GridLayoutDataTextViewMonospace" />
<TextView
style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_as_array" />
<TextView
android:id="@+id/data_as_array"
style="@style/GridLayoutDataTextViewMonospace" />
</GridLayout>
<View
android:id="@+id/lowerSepparator"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_above="@id/gattInformation"
android:background="@android:color/holo_blue_dark" />
<ExpandableListView <ExpandableListView
android:id="@+id/gatt_services_list" android:id="@+id/gatt_services_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="fill_parent"
android:layout_above="@id/lowerSepparator"
android:layout_below="@id/upperSepparator" />
</LinearLayout> </RelativeLayout>
sample_app/res/layout/list_item_view_adrecord.xml
+2 -2
View File
@@ -23,7 +23,7 @@
style="@style/GridLayoutTitleTextView" style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="As String:" /> android:text="@string/label_as_string" />
<TextView <TextView
android:id="@+id/data_as_string" android:id="@+id/data_as_string"
@@ -33,7 +33,7 @@
style="@style/GridLayoutTitleTextView" style="@style/GridLayoutTitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="As Array:" /> android:text="@string/label_as_array" />
<TextView <TextView
android:id="@+id/data_as_array" android:id="@+id/data_as_array"
sample_app/res/values/strings.xml
+3
View File
@@ -51,5 +51,8 @@
<string name="header_device_info">Device Info</string> <string name="header_device_info">Device Info</string>
<string name="invalid_device_data">Invalid Device Data!</string> <string name="invalid_device_data">Invalid Device Data!</string>
<string name="unknown">unknown</string> <string name="unknown">unknown</string>
<string name="label_as_string">As String:</string>
<string name="label_as_array">As Array:</string>
<string name="label_desc">Desc:</string>
</resources> </resources>
sample_app/src/uk/co/alt236/btlescan/activities/DeviceControlActivity.java
+143 -117
View File
@@ -19,8 +19,10 @@ package uk.co.alt236.btlescan.activities;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import uk.co.alt236.bluetoothlelib.resolvers.GattAttributeResolver; import uk.co.alt236.bluetoothlelib.resolvers.GattAttributeResolver;
import uk.co.alt236.bluetoothlelib.util.ByteUtils;
import uk.co.alt236.btlescan.R; import uk.co.alt236.btlescan.R;
import uk.co.alt236.btlescan.services.BluetoothLeService; import uk.co.alt236.btlescan.services.BluetoothLeService;
import android.app.Activity; import android.app.Activity;
@@ -41,6 +43,8 @@ import android.view.View;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import android.widget.SimpleExpandableListAdapter; import android.widget.SimpleExpandableListAdapter;
import android.widget.TextView; import android.widget.TextView;
import butterknife.ButterKnife;
import butterknife.InjectView;
/** /**
* For a given BLE device, this Activity provides the user interface to connect, display data, * For a given BLE device, this Activity provides the user interface to connect, display data,
@@ -54,23 +58,27 @@ public class DeviceControlActivity extends Activity {
public static final String EXTRAS_DEVICE_NAME = "DEVICE_NAME"; public static final String EXTRAS_DEVICE_NAME = "DEVICE_NAME";
public static final String EXTRAS_DEVICE_ADDRESS = "DEVICE_ADDRESS"; public static final String EXTRAS_DEVICE_ADDRESS = "DEVICE_ADDRESS";
private TextView mConnectionState; private static final String LIST_NAME = "NAME";
private TextView mDataField; private static final String LIST_UUID = "UUID";
private String mDeviceName;
private String mDeviceAddress;
private ExpandableListView mGattServicesList;
private BluetoothLeService mBluetoothLeService;
private ArrayList<ArrayList<BluetoothGattCharacteristic>> mGattCharacteristics =
new ArrayList<ArrayList<BluetoothGattCharacteristic>>();
private boolean mConnected = false;
private BluetoothGattCharacteristic mNotifyCharacteristic;
private final String LIST_NAME = "NAME"; private BluetoothGattCharacteristic mNotifyCharacteristic;
private final String LIST_UUID = "UUID"; private BluetoothLeService mBluetoothLeService;
private List<List<BluetoothGattCharacteristic>> mGattCharacteristics = new ArrayList<List<BluetoothGattCharacteristic>>();
private String mDeviceAddress;
private String mDeviceName;
@InjectView(R.id.gatt_services_list) ExpandableListView mGattServicesList;
@InjectView(R.id.connection_state) TextView mConnectionState;
@InjectView(R.id.uuid) TextView mGattUUID;
@InjectView(R.id.description) TextView mGattUUIDDesc;
@InjectView(R.id.data_as_string) TextView mDataAsString;
@InjectView(R.id.data_as_array) TextView mDataAsArray;
private boolean mConnected = false;
// Code to manage Service lifecycle. // Code to manage Service lifecycle.
private final ServiceConnection mServiceConnection = new ServiceConnection() { private final ServiceConnection mServiceConnection = new ServiceConnection() {
@Override @Override
public void onServiceConnected(ComponentName componentName, IBinder service) { public void onServiceConnected(ComponentName componentName, IBinder service) {
mBluetoothLeService = ((BluetoothLeService.LocalBinder) service).getService(); mBluetoothLeService = ((BluetoothLeService.LocalBinder) service).getService();
@@ -92,8 +100,8 @@ public class DeviceControlActivity extends Activity {
// ACTION_GATT_CONNECTED: connected to a GATT server. // ACTION_GATT_CONNECTED: connected to a GATT server.
// ACTION_GATT_DISCONNECTED: disconnected from a GATT server. // ACTION_GATT_DISCONNECTED: disconnected from a GATT server.
// ACTION_GATT_SERVICES_DISCOVERED: discovered GATT services. // ACTION_GATT_SERVICES_DISCOVERED: discovered GATT services.
// ACTION_DATA_AVAILABLE: received data from the device. This can be a result of read // ACTION_DATA_AVAILABLE: received data from the device.
// or notification operations. // this can be a result of read or notification operations.
private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@@ -111,7 +119,14 @@ public class DeviceControlActivity extends Activity {
// Show all the supported services and characteristics on the user interface. // Show all the supported services and characteristics on the user interface.
displayGattServices(mBluetoothLeService.getSupportedGattServices()); displayGattServices(mBluetoothLeService.getSupportedGattServices());
} else if (BluetoothLeService.ACTION_DATA_AVAILABLE.equals(action)) { } else if (BluetoothLeService.ACTION_DATA_AVAILABLE.equals(action)) {
displayData(intent.getStringExtra(BluetoothLeService.EXTRA_DATA)); final String noData = getString(R.string.no_data);
final String uuid = intent.getStringExtra(BluetoothLeService.EXTRA_UUID_CHAR);
final byte[] dataArr = intent.getByteArrayExtra(BluetoothLeService.EXTRA_DATA_RAW);
mGattUUID.setText(tryString(uuid, noData));
mGattUUIDDesc.setText(GattAttributeResolver.getAttributeName(uuid, getString(R.string.unknown)));
mDataAsArray.setText(ByteUtils.byteArrayToHexString(dataArr));
mDataAsString.setText(new String(dataArr));
} }
} }
}; };
@@ -120,29 +135,24 @@ public class DeviceControlActivity extends Activity {
// demonstrates 'Read' and 'Notify' features. See // demonstrates 'Read' and 'Notify' features. See
// http://d.android.com/reference/android/bluetooth/BluetoothGatt.html for the complete // http://d.android.com/reference/android/bluetooth/BluetoothGatt.html for the complete
// list of supported characteristic features. // list of supported characteristic features.
private final ExpandableListView.OnChildClickListener servicesListClickListner = private final ExpandableListView.OnChildClickListener servicesListClickListner = new ExpandableListView.OnChildClickListener() {
new ExpandableListView.OnChildClickListener() {
@Override @Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
int childPosition, long id) {
if (mGattCharacteristics != null) { if (mGattCharacteristics != null) {
final BluetoothGattCharacteristic characteristic = final BluetoothGattCharacteristic characteristic = mGattCharacteristics.get(groupPosition).get(childPosition);
mGattCharacteristics.get(groupPosition).get(childPosition);
final int charaProp = characteristic.getProperties(); final int charaProp = characteristic.getProperties();
if ((charaProp | BluetoothGattCharacteristic.PROPERTY_READ) > 0) { if ((charaProp | BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
// If there is an active notification on a characteristic, clear // If there is an active notification on a characteristic, clear
// it first so it doesn't update the data field on the user interface. // it first so it doesn't update the data field on the user interface.
if (mNotifyCharacteristic != null) { if (mNotifyCharacteristic != null) {
mBluetoothLeService.setCharacteristicNotification( mBluetoothLeService.setCharacteristicNotification(mNotifyCharacteristic, false);
mNotifyCharacteristic, false);
mNotifyCharacteristic = null; mNotifyCharacteristic = null;
} }
mBluetoothLeService.readCharacteristic(characteristic); mBluetoothLeService.readCharacteristic(characteristic);
} }
if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) { if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
mNotifyCharacteristic = characteristic; mNotifyCharacteristic = characteristic;
mBluetoothLeService.setCharacteristicNotification( mBluetoothLeService.setCharacteristicNotification(characteristic, true);
characteristic, true);
} }
return true; return true;
} }
@@ -150,9 +160,65 @@ public class DeviceControlActivity extends Activity {
} }
}; };
private void clearUI() { private void clearUI() {
mGattServicesList.setAdapter((SimpleExpandableListAdapter) null); mGattServicesList.setAdapter((SimpleExpandableListAdapter) null);
mDataField.setText(R.string.no_data); mGattUUID.setText(R.string.no_data);
mGattUUIDDesc.setText(R.string.no_data);
mDataAsArray.setText(R.string.no_data);
mDataAsString.setText(R.string.no_data);
}
// Demonstrates how to iterate through the supported GATT Services/Characteristics.
// In this sample, we populate the data structure that is bound to the ExpandableListView
// on the UI.
private void displayGattServices(List<BluetoothGattService> gattServices) {
if (gattServices == null) return;
String uuid = null;
final String unknownServiceString = getResources().getString(R.string.unknown_service);
final String unknownCharaString = getResources().getString(R.string.unknown_characteristic);
final List<Map<String, String>> gattServiceData = new ArrayList<Map<String, String>>();
final List<List<Map<String, String>>> gattCharacteristicData = new ArrayList<List<Map<String, String>>>();
mGattCharacteristics = new ArrayList<List<BluetoothGattCharacteristic>>();
// Loops through available GATT Services.
for (BluetoothGattService gattService : gattServices) {
final Map<String, String> currentServiceData = new HashMap<String, String>();
uuid = gattService.getUuid().toString();
currentServiceData.put(LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownServiceString));
currentServiceData.put(LIST_UUID, uuid);
gattServiceData.add(currentServiceData);
final List<Map<String, String>> gattCharacteristicGroupData = new ArrayList<Map<String, String>>();
final List<BluetoothGattCharacteristic> gattCharacteristics = gattService.getCharacteristics();
final List<BluetoothGattCharacteristic> charas = new ArrayList<BluetoothGattCharacteristic>();
// Loops through available Characteristics.
for (final BluetoothGattCharacteristic gattCharacteristic : gattCharacteristics) {
charas.add(gattCharacteristic);
final Map<String, String> currentCharaData = new HashMap<String, String>();
uuid = gattCharacteristic.getUuid().toString();
currentCharaData.put(LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownCharaString));
currentCharaData.put(LIST_UUID, uuid);
gattCharacteristicGroupData.add(currentCharaData);
}
mGattCharacteristics.add(charas);
gattCharacteristicData.add(gattCharacteristicGroupData);
}
final SimpleExpandableListAdapter gattServiceAdapter = new SimpleExpandableListAdapter(
this,
gattServiceData,
android.R.layout.simple_expandable_list_item_2,
new String[] {LIST_NAME, LIST_UUID},
new int[] { android.R.id.text1, android.R.id.text2 },
gattCharacteristicData,
android.R.layout.simple_expandable_list_item_2,
new String[] {LIST_NAME, LIST_UUID},
new int[] { android.R.id.text1, android.R.id.text2 }
);
mGattServicesList.setAdapter(gattServiceAdapter);
} }
@Override @Override
@@ -164,42 +230,19 @@ public class DeviceControlActivity extends Activity {
mDeviceName = intent.getStringExtra(EXTRAS_DEVICE_NAME); mDeviceName = intent.getStringExtra(EXTRAS_DEVICE_NAME);
mDeviceAddress = intent.getStringExtra(EXTRAS_DEVICE_ADDRESS); mDeviceAddress = intent.getStringExtra(EXTRAS_DEVICE_ADDRESS);
ButterKnife.inject(this);
// Sets up UI references. // Sets up UI references.
((TextView) findViewById(R.id.device_address)).setText(mDeviceAddress); ((TextView) findViewById(R.id.device_address)).setText(mDeviceAddress);
mGattServicesList = (ExpandableListView) findViewById(R.id.gatt_services_list);
mGattServicesList.setOnChildClickListener(servicesListClickListner); mGattServicesList.setOnChildClickListener(servicesListClickListner);
mConnectionState = (TextView) findViewById(R.id.connection_state);
mDataField = (TextView) findViewById(R.id.data_value);
getActionBar().setTitle(mDeviceName); getActionBar().setTitle(mDeviceName);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
final Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE); bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
} }
@Override
protected void onResume() {
super.onResume();
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
if (mBluetoothLeService != null) {
final boolean result = mBluetoothLeService.connect(mDeviceAddress);
Log.d(TAG, "Connect request result=" + result);
}
}
@Override
protected void onPause() {
super.onPause();
unregisterReceiver(mGattUpdateReceiver);
}
@Override
protected void onDestroy() {
super.onDestroy();
unbindService(mServiceConnection);
mBluetoothLeService = null;
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.gatt_services, menu); getMenuInflater().inflate(R.menu.gatt_services, menu);
@@ -213,6 +256,13 @@ public class DeviceControlActivity extends Activity {
return true; return true;
} }
@Override
protected void onDestroy() {
super.onDestroy();
unbindService(mServiceConnection);
mBluetoothLeService = null;
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) { switch(item.getItemId()) {
@@ -229,78 +279,46 @@ public class DeviceControlActivity extends Activity {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override
protected void onPause() {
super.onPause();
unregisterReceiver(mGattUpdateReceiver);
}
@Override
protected void onResume() {
super.onResume();
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
if (mBluetoothLeService != null) {
final boolean result = mBluetoothLeService.connect(mDeviceAddress);
Log.d(TAG, "Connect request result=" + result);
}
}
private void updateConnectionState(final int resourceId) { private void updateConnectionState(final int resourceId) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
final int colourId;
switch(resourceId){
case R.string.connected:
colourId = android.R.color.holo_green_dark;
break;
case R.string.disconnected:
colourId = android.R.color.holo_red_dark;
break;
default:
colourId = android.R.color.black;
break;
}
mConnectionState.setText(resourceId); mConnectionState.setText(resourceId);
mConnectionState.setTextColor(getResources().getColor(colourId));
} }
}); });
} }
private void displayData(String data) {
if (data != null) {
mDataField.setText(data);
}
}
// Demonstrates how to iterate through the supported GATT Services/Characteristics.
// In this sample, we populate the data structure that is bound to the ExpandableListView
// on the UI.
private void displayGattServices(List<BluetoothGattService> gattServices) {
if (gattServices == null) return;
String uuid = null;
String unknownServiceString = getResources().getString(R.string.unknown_service);
String unknownCharaString = getResources().getString(R.string.unknown_characteristic);
ArrayList<HashMap<String, String>> gattServiceData = new ArrayList<HashMap<String, String>>();
ArrayList<ArrayList<HashMap<String, String>>> gattCharacteristicData
= new ArrayList<ArrayList<HashMap<String, String>>>();
mGattCharacteristics = new ArrayList<ArrayList<BluetoothGattCharacteristic>>();
// Loops through available GATT Services.
for (BluetoothGattService gattService : gattServices) {
HashMap<String, String> currentServiceData = new HashMap<String, String>();
uuid = gattService.getUuid().toString();
currentServiceData.put(
LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownServiceString));
currentServiceData.put(LIST_UUID, uuid);
gattServiceData.add(currentServiceData);
ArrayList<HashMap<String, String>> gattCharacteristicGroupData =
new ArrayList<HashMap<String, String>>();
List<BluetoothGattCharacteristic> gattCharacteristics =
gattService.getCharacteristics();
ArrayList<BluetoothGattCharacteristic> charas =
new ArrayList<BluetoothGattCharacteristic>();
// Loops through available Characteristics.
for (BluetoothGattCharacteristic gattCharacteristic : gattCharacteristics) {
charas.add(gattCharacteristic);
HashMap<String, String> currentCharaData = new HashMap<String, String>();
uuid = gattCharacteristic.getUuid().toString();
currentCharaData.put(
LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownCharaString));
currentCharaData.put(LIST_UUID, uuid);
gattCharacteristicGroupData.add(currentCharaData);
}
mGattCharacteristics.add(charas);
gattCharacteristicData.add(gattCharacteristicGroupData);
}
SimpleExpandableListAdapter gattServiceAdapter = new SimpleExpandableListAdapter(
this,
gattServiceData,
android.R.layout.simple_expandable_list_item_2,
new String[] {LIST_NAME, LIST_UUID},
new int[] { android.R.id.text1, android.R.id.text2 },
gattCharacteristicData,
android.R.layout.simple_expandable_list_item_2,
new String[] {LIST_NAME, LIST_UUID},
new int[] { android.R.id.text1, android.R.id.text2 }
);
mGattServicesList.setAdapter(gattServiceAdapter);
}
private static IntentFilter makeGattUpdateIntentFilter() { private static IntentFilter makeGattUpdateIntentFilter() {
final IntentFilter intentFilter = new IntentFilter(); final IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothLeService.ACTION_GATT_CONNECTED); intentFilter.addAction(BluetoothLeService.ACTION_GATT_CONNECTED);
@@ -309,4 +327,12 @@ public class DeviceControlActivity extends Activity {
intentFilter.addAction(BluetoothLeService.ACTION_DATA_AVAILABLE); intentFilter.addAction(BluetoothLeService.ACTION_DATA_AVAILABLE);
return intentFilter; return intentFilter;
} }
private static String tryString(String string, String fallback){
if(string == null){
return fallback;
} else{
return string;
}
}
} }
sample_app/src/uk/co/alt236/btlescan/services/BluetoothLeService.java
+18 -59
View File
@@ -17,16 +17,13 @@
package uk.co.alt236.btlescan.services; package uk.co.alt236.btlescan.services;
import java.util.List; import java.util.List;
import java.util.UUID;
import uk.co.alt236.bluetoothlelib.resolvers.GattAttributeResolver;
import android.app.Service; import android.app.Service;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback; import android.bluetooth.BluetoothGattCallback;
import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattDescriptor;
import android.bluetooth.BluetoothGattService; import android.bluetooth.BluetoothGattService;
import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothManager;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
@@ -53,19 +50,12 @@ public class BluetoothLeService extends Service {
private static final int STATE_CONNECTING = 1; private static final int STATE_CONNECTING = 1;
private static final int STATE_CONNECTED = 2; private static final int STATE_CONNECTED = 2;
public final static String ACTION_GATT_CONNECTED = public final static String ACTION_GATT_CONNECTED = "com.example.bluetooth.le.ACTION_GATT_CONNECTED";
"com.example.bluetooth.le.ACTION_GATT_CONNECTED"; public final static String ACTION_GATT_DISCONNECTED = "com.example.bluetooth.le.ACTION_GATT_DISCONNECTED";
public final static String ACTION_GATT_DISCONNECTED = public final static String ACTION_GATT_SERVICES_DISCOVERED = "com.example.bluetooth.le.ACTION_GATT_SERVICES_DISCOVERED";
"com.example.bluetooth.le.ACTION_GATT_DISCONNECTED"; public final static String ACTION_DATA_AVAILABLE = "com.example.bluetooth.le.ACTION_DATA_AVAILABLE";
public final static String ACTION_GATT_SERVICES_DISCOVERED = public final static String EXTRA_DATA_RAW = "com.example.bluetooth.le.EXTRA_DATA_RAW";
"com.example.bluetooth.le.ACTION_GATT_SERVICES_DISCOVERED"; public final static String EXTRA_UUID_CHAR = "com.example.bluetooth.le.EXTRA_UUID_CHAR";
public final static String ACTION_DATA_AVAILABLE =
"com.example.bluetooth.le.ACTION_DATA_AVAILABLE";
public final static String EXTRA_DATA =
"com.example.bluetooth.le.EXTRA_DATA";
public final static UUID UUID_HEART_RATE_MEASUREMENT =
UUID.fromString(GattAttributeResolver.HEART_RATE_MEASUREMENT);
// Implements callback methods for GATT events that the app cares about. For example, // Implements callback methods for GATT events that the app cares about. For example,
// connection change and services discovered. // connection change and services discovered.
@@ -79,8 +69,7 @@ public class BluetoothLeService extends Service {
broadcastUpdate(intentAction); broadcastUpdate(intentAction);
Log.i(TAG, "Connected to GATT server."); Log.i(TAG, "Connected to GATT server.");
// Attempts to discover services after successful connection. // Attempts to discover services after successful connection.
Log.i(TAG, "Attempting to start service discovery:" + Log.i(TAG, "Attempting to start service discovery:" + mBluetoothGatt.discoverServices());
mBluetoothGatt.discoverServices());
} else if (newState == BluetoothProfile.STATE_DISCONNECTED) { } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
intentAction = ACTION_GATT_DISCONNECTED; intentAction = ACTION_GATT_DISCONNECTED;
@@ -100,17 +89,14 @@ public class BluetoothLeService extends Service {
} }
@Override @Override
public void onCharacteristicRead(BluetoothGatt gatt, public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
BluetoothGattCharacteristic characteristic,
int status) {
if (status == BluetoothGatt.GATT_SUCCESS) { if (status == BluetoothGatt.GATT_SUCCESS) {
broadcastUpdate(ACTION_DATA_AVAILABLE, characteristic); broadcastUpdate(ACTION_DATA_AVAILABLE, characteristic);
} }
} }
@Override @Override
public void onCharacteristicChanged(BluetoothGatt gatt, public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
BluetoothGattCharacteristic characteristic) {
broadcastUpdate(ACTION_DATA_AVAILABLE, characteristic); broadcastUpdate(ACTION_DATA_AVAILABLE, characteristic);
} }
}; };
@@ -120,36 +106,16 @@ public class BluetoothLeService extends Service {
sendBroadcast(intent); sendBroadcast(intent);
} }
private void broadcastUpdate(final String action, private void broadcastUpdate(final String action, final BluetoothGattCharacteristic characteristic) {
final BluetoothGattCharacteristic characteristic) {
final Intent intent = new Intent(action); final Intent intent = new Intent(action);
intent.putExtra(EXTRA_UUID_CHAR, characteristic.getUuid().toString());
// This is special handling for the Heart Rate Measurement profile. Data parsing is // Always try to add the RAW value
// carried out as per profile specifications:
// http://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.heart_rate_measurement.xml
if (UUID_HEART_RATE_MEASUREMENT.equals(characteristic.getUuid())) {
int flag = characteristic.getProperties();
int format = -1;
if ((flag & 0x01) != 0) {
format = BluetoothGattCharacteristic.FORMAT_UINT16;
Log.d(TAG, "Heart rate format UINT16.");
} else {
format = BluetoothGattCharacteristic.FORMAT_UINT8;
Log.d(TAG, "Heart rate format UINT8.");
}
final int heartRate = characteristic.getIntValue(format, 1);
Log.d(TAG, String.format("Received heart rate: %d", heartRate));
intent.putExtra(EXTRA_DATA, String.valueOf(heartRate));
} else {
// For all other profiles, writes the data formatted in HEX.
final byte[] data = characteristic.getValue(); final byte[] data = characteristic.getValue();
if (data != null && data.length > 0) { if (data != null && data.length > 0) {
final StringBuilder stringBuilder = new StringBuilder(data.length); intent.putExtra(EXTRA_DATA_RAW, data);
for(byte byteChar : data)
stringBuilder.append(String.format("%02X ", byteChar));
intent.putExtra(EXTRA_DATA, new String(data) + "\n" + stringBuilder.toString());
}
} }
sendBroadcast(intent); sendBroadcast(intent);
} }
@@ -217,8 +183,10 @@ public class BluetoothLeService extends Service {
} }
// Previously connected device. Try to reconnect. // Previously connected device. Try to reconnect.
if (mBluetoothDeviceAddress != null && address.equals(mBluetoothDeviceAddress) if (mBluetoothDeviceAddress != null
&& address.equals(mBluetoothDeviceAddress)
&& mBluetoothGatt != null) { && mBluetoothGatt != null) {
Log.d(TAG, "Trying to use an existing mBluetoothGatt for connection."); Log.d(TAG, "Trying to use an existing mBluetoothGatt for connection.");
if (mBluetoothGatt.connect()) { if (mBluetoothGatt.connect()) {
mConnectionState = STATE_CONNECTING; mConnectionState = STATE_CONNECTING;
@@ -289,21 +257,12 @@ public class BluetoothLeService extends Service {
* @param characteristic Characteristic to act on. * @param characteristic Characteristic to act on.
* @param enabled If true, enable notification. False otherwise. * @param enabled If true, enable notification. False otherwise.
*/ */
public void setCharacteristicNotification(BluetoothGattCharacteristic characteristic, public void setCharacteristicNotification(BluetoothGattCharacteristic characteristic, boolean enabled) {
boolean enabled) {
if (mBluetoothAdapter == null || mBluetoothGatt == null) { if (mBluetoothAdapter == null || mBluetoothGatt == null) {
Log.w(TAG, "BluetoothAdapter not initialized"); Log.w(TAG, "BluetoothAdapter not initialized");
return; return;
} }
mBluetoothGatt.setCharacteristicNotification(characteristic, enabled); mBluetoothGatt.setCharacteristicNotification(characteristic, enabled);
// This is specific to Heart Rate Measurement.
if (UUID_HEART_RATE_MEASUREMENT.equals(characteristic.getUuid())) {
BluetoothGattDescriptor descriptor = characteristic.getDescriptor(
UUID.fromString(GattAttributeResolver.CLIENT_CHARACTERISTIC_CONFIG));
descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
mBluetoothGatt.writeDescriptor(descriptor);
}
} }
/** /**