Merge pull request #10 from ulizama/master

whilu · web-flow · commit 2fca082bdd3e · 2016-08-26T10:14:13.000+08:00
Add Scan By Service and Specify which read/write characteristics to subscribe
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Aug 19 18:14:54 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/lmbluetoothsdk/build.gradle b/lmbluetoothsdk/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 102
-        versionName "1.0.2"
+        versionCode 103
+        versionName "1.0.3"
     }
     buildTypes {
         release {
diff --git a/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/BluetoothLEController.java b/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/BluetoothLEController.java
@@ -43,6 +43,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
+import android.os.ParcelUuid;
 
 import co.lujun.lmbluetoothsdk.base.Bluetooth;
 import co.lujun.lmbluetoothsdk.base.BluetoothLEListener;
@@ -114,12 +116,16 @@ public void setBluetoothListener(BluetoothLEListener listener){
 
     /**
      *  Check to determine whether BLE is supported on the device.
-     * @return
+     * @return boolean
      */
     public boolean isSupportBLE(){
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE);
     }
 
+    /**
+     * Start the scan of devices
+     * @return boolean
+     */
     @Override
     public boolean startScan() {
         if (!isAvailable() && !isEnabled()){
@@ -136,6 +142,43 @@ public boolean startScan() {
         return true;
     }
 
+    /**
+     * start scanning for possible devices who matches the service id
+     * @param serviceUUIDs the list of possible UUIDs to search
+     * @return boolean
+     */
+    @Override
+    public boolean startScanByService(List<UUID> serviceUUIDs) {
+        if (!isAvailable() && !isEnabled()){
+            return false;
+        }
+        if (Build.VERSION.SDK_INT >= 21){
+            mLEScanner = mBluetoothAdapter.getBluetoothLeScanner();
+            mLeSettings = new ScanSettings.Builder()
+                    .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+                    .build();
+            mLeFilters = scanFilters(serviceUUIDs);
+        }
+        scanLeDevice();
+        return true;
+    }
+
+    /**
+     * The actual implementation of the filtering for services
+     * @param serviceUUIDs the list of possible UUIDs to search
+     * @return List
+     */
+    private List<ScanFilter> scanFilters(List<UUID> serviceUUIDs) {
+        List<ScanFilter> list = new ArrayList<>();
+
+        for (UUID uuid : serviceUUIDs) {
+            ScanFilter filter = new ScanFilter.Builder().setServiceUuid(ParcelUuid.fromString(uuid.toString())).build();
+            list.add(filter);
+        }
+
+        return list;
+    }
+
     private void scanLeDevice(){
         mHandler.postDelayed(new Runnable() {
             @Override
@@ -238,7 +281,7 @@ public void setScanTime(int time){
 
     /**
      * Get scan time.
-     * @return
+     * @return int
      */
     public int getScanTime() {
         return mScanTime;
@@ -260,6 +303,14 @@ public void onLeScan(BluetoothDevice device, int rssi, byte[] scanRecord) {
 
     };
 
+    public void setWriteCharacteristic(String characteristicUUID) {
+        mBluetoothLEService.setWriteCharacteristic(characteristicUUID);
+    }
+
+    public void setReadCharacteristic(String characteristicUUID) {
+        mBluetoothLEService.setReadCharacteristic(characteristicUUID);
+    }
+
     private CBTScanCallback mCbtScanCallback;
 
     private class CBTScanCallback extends ScanCallback {
diff --git a/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/Bluetooth.java b/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/Bluetooth.java
@@ -31,7 +31,9 @@
 import android.content.Context;
 import android.content.IntentFilter;
 
+import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 import co.lujun.lmbluetoothsdk.receiver.BlueToothReceiver;
 
@@ -138,6 +140,15 @@ public boolean startScan(){
         return false;
     }
 
+    /**
+     * Start scan for found bluetooth device with service filter.
+     * @param serviceUUIDs the list of possible UUIDs to search
+     * @return if start scan operation success, return true
+     */
+    public boolean startScanByService(List<UUID> serviceUUIDs){
+        return false;
+    }
+
     /**
      * Cancel device's bluetooth scan operation.
      * @return if cancel scan operation success, return true
diff --git a/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/BluetoothLEListener.java b/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/base/BluetoothLEListener.java
@@ -26,7 +26,10 @@
 
 package co.lujun.lmbluetoothsdk.base;
 
+
+import java.util.List;
 import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattService;
 
 /**
  * Author: lujun(http://blog.lujun.co)
@@ -36,19 +39,32 @@ public interface BluetoothLEListener extends BaseListener {
 
     /**
      * Read data from BLE device.
-     * @param characteristic
+     * @param characteristic the characteristic
      */
     void onReadData(BluetoothGattCharacteristic characteristic);
 
     /**
      * When write data to remote BLE device, the notification will send to here.
-     * @param characteristic
+     * @param characteristic the characteristic
      */
     void onWriteData(BluetoothGattCharacteristic characteristic);
 
     /**
      * When data changed, the notification will send to here.
-     * @param characteristic
+     * @param characteristic the characteristic
      */
     void onDataChanged(BluetoothGattCharacteristic characteristic);
+
+    /**
+     * When a service is discovered, send the list of characteristics
+     * @param characteristics the list of characteristics
+     */
+    void onDiscoveringCharacteristics(List<BluetoothGattCharacteristic> characteristics);
+
+
+    /**
+     * When a device is connected, send the list of services
+     * @param services the list of services
+     */
+    void onDiscoveringServices(List<BluetoothGattService> services);
 }
diff --git a/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/service/BluetoothLEService.java b/lmbluetoothsdk/src/main/java/co/lujun/lmbluetoothsdk/service/BluetoothLEService.java
@@ -34,6 +34,7 @@
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
 import java.util.List;
 
@@ -51,6 +52,8 @@ public class BluetoothLEService {
     private BaseListener mBluetoothListener;
     private BluetoothGatt mBluetoothGatt;
     private BluetoothGattCharacteristic mWriteCharacteristic, mNotifyCharacteristic;
+    private String writeCharacteristicUUID;
+    private String readCharacteristicUUID;
 
     private int mState;
 
@@ -89,8 +92,8 @@ public int getState() {
 
     /**
      * Connect to a GATT server.
-     * @param context
-     * @param device
+     * @param context the context
+     * @param device the device
      */
     public void connect(Context context, BluetoothDevice device){
         setState(State.STATE_CONNECTING);
@@ -128,7 +131,7 @@ public void close(){
 
     /**
      * Write data to remote device.
-     * @param data
+     * @param data data to send to the device
      */
     public void write(byte[] data){
         if (mBluetoothGatt != null){
@@ -137,6 +140,14 @@ public void write(byte[] data){
         }
     }
 
+    public void setWriteCharacteristic(String characteristicUUID) {
+        writeCharacteristicUUID = characteristicUUID;
+    }
+
+    public void setReadCharacteristic(String characteristicUUID) {
+        readCharacteristicUUID = characteristicUUID;
+    }
+
     private BluetoothGattCallback mBTGattCallback = new BluetoothGattCallback() {
         @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
@@ -160,26 +171,55 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
             super.onServicesDiscovered(gatt, status);
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 List<BluetoothGattService> services = gatt.getServices();
+                if(mBluetoothListener != null){
+                    ((BluetoothLEListener)mBluetoothListener).onDiscoveringServices(services);
+                }
                 for (BluetoothGattService service : services) {
                     List<BluetoothGattCharacteristic> characteristics = service.getCharacteristics();
                     for (BluetoothGattCharacteristic characteristic : characteristics) {
                         final int charaProp = characteristic.getProperties();
+                        final String charaUUID = characteristic.getUuid().toString();
+
                         if ((charaProp | BluetoothGattCharacteristic.PERMISSION_READ) > 0){
-                            if (mNotifyCharacteristic != null){
-                                mBluetoothGatt.setCharacteristicNotification(mNotifyCharacteristic, false);
-                                mNotifyCharacteristic = null;
+                            if(readCharacteristicUUID.isEmpty()){
+                                if (mNotifyCharacteristic != null){
+                                    mBluetoothGatt.setCharacteristicNotification(mNotifyCharacteristic, false);
+                                    mNotifyCharacteristic = null;
+                                }
+                                gatt.readCharacteristic(characteristic);
                             }
-                            gatt.readCharacteristic(characteristic);
+                            Log.d("LMBluetoothSdk", "Assigning read characteristic : " + characteristic.getUuid());
                         }
-                        if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0){
-                            mNotifyCharacteristic = characteristic;
-                            mBluetoothGatt.setCharacteristicNotification(characteristic, true);
+
+                        if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
+                            if(readCharacteristicUUID.isEmpty()){
+                                mNotifyCharacteristic = characteristic;
+                                mBluetoothGatt.setCharacteristicNotification(characteristic, true);
+                            }else if(charaUUID.equalsIgnoreCase(readCharacteristicUUID)){
+                                mNotifyCharacteristic = characteristic;
+                                if( mBluetoothGatt.setCharacteristicNotification(characteristic, true) ) {
+                                    Log.d("LMBluetoothSdk", "Subscribing to characteristic : " + characteristic.getUuid());
+                                }
+                            }
                         }
-                        if (((charaProp & BluetoothGattCharacteristic.PERMISSION_WRITE)
-                                | (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) > 0){
-                            mWriteCharacteristic = characteristic;
+
+                        if(writeCharacteristicUUID.isEmpty()){
+                            if (((charaProp & BluetoothGattCharacteristic.PERMISSION_WRITE)
+                                    | (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) > 0){
+                                mWriteCharacteristic = characteristic;
+                            }
+                        }else{
+                            if (((charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE)
+                                    | (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) > 0
+                                    & charaUUID.equalsIgnoreCase(writeCharacteristicUUID)) {
+                                Log.d("LMBluetoothSdk", "Assigning write characteristic : " + characteristic.getUuid());
+                                mWriteCharacteristic = characteristic;
+                            }
                         }
                     }
+                    if(mBluetoothListener != null){
+                        ((BluetoothLEListener)mBluetoothListener).onDiscoveringCharacteristics(characteristics);
+                    }
                 }
                 setState(State.STATE_GOT_CHARACTERISTICS);
             }
diff --git a/lmbluetoothsdk/src/test/java/co/lujun/lmbluetoothsdk/ExampleUnitTest.java b/lmbluetoothsdk/src/test/java/co/lujun/lmbluetoothsdk/ExampleUnitTest.java
@@ -1,15 +1,14 @@
 package co.lujun.lmbluetoothsdk;
 
-import org.junit.Test;
+//import org.junit.Test;
 
-import static org.junit.Assert.*;
+//import static org.junit.Assert.*;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.
  */
 public class ExampleUnitTest {
-    @Test
     public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
+//        assertEquals(4, 2 + 2);
     }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "co.lujun.sample"
diff --git a/sample/src/main/java/co/lujun/sample/BleActivity.java b/sample/src/main/java/co/lujun/sample/BleActivity.java

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:1.5.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.1.2'`
`9`	`9`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'`
`10`	`10`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'`
`11`	`11`