fix last bug that scan result is null cause null pointer exception

Author: junkchen

README.md

@@ -1,6 +1,5 @@
-#*BleLib*
+# **BleLib** #
 
-----------
 BleLib 是 Android 低功耗蓝牙 4.0 及以上开发的辅助库，一行代码解决 Ble 初始化、扫描、连接、特性读写、设置通知等操作。 
 
 BleLib 中的关键类：
@@ -10,18 +9,23 @@ BleLib 中的关键类：
 - MultipleBleService 类是可多个蓝牙设备同时连接的服务类
 
 
-##*Usage*
+## **Screenshots** ##
+
+![](sample/screenshots/connect_single_device.png) ![](sample/screenshots/connect_multiple_devices.png)
+
+
+## **Usage** ##
 
 可看博客： [使用 BleLib 的轻松搞定 Android 低功耗蓝牙 Ble 4.0 开发详解](http://blog.csdn.net/kjunchen/article/details/50909410)
 
-###*引入*
+## **引入** ##
 BleLib 库已上传至 jcenter、maven central 仓库  
 因此，在你项目 Module 中的 build.gradle 文件中添加库依赖即可，如下：  
 Gradle:
 
 ```.gradle
 dependencies {
-    compile 'com.junkchen.blelib:blelib:1.2.3'
+    compile 'com.junkchen.blelib:blelib:1.2.4'
 }
 ```
 
@@ -132,6 +136,11 @@ mBleService.setOnDataAvailableListener(new BleService.OnDataAvailableListener()
 
 ## **Release Notes** ##
 
+- **blelib-1.2.4**（2017-05-31）
+  
+  - 修复上个版本未解决的 bug，并优化代码。
+ 	
+
 - **blelib-1.2.3**（2016-09-23）
 
     - 修复扫描结果返回时出现空指针的 bug 。
@@ -154,14 +163,15 @@ mBleService.setOnDataAvailableListener(new BleService.OnDataAvailableListener()
 	- 在 OnDataAvailableListener 接口中新增 onDescriptorRead() 方法 。
 
 
-##*Reference*
+## **Reference** ##
 
 [https://developer.android.com/guide/topics/connectivity/bluetooth-le.html](https://developer.android.com/guide/topics/connectivity/bluetooth-le.html)
 
 
-##*License*
+## **License** ##
 
 BleLib is released under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0).
+
 ```.html
 Copyright 2016 Junk Chen.
 

blelib/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 ext {
-    libraryVersion = '1.2.3'
+    libraryVersion = '1.2.4'
 
     bintrayRepo = 'maven'
     bintrayName = 'blelib'
@@ -27,13 +27,13 @@ ext {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion '26.0.0 rc2'
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 23
         versionCode 1
-        versionName "1.2.3"
+        versionName "1.2.4"
     }
     buildTypes {
         release {
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.1'
 }

blelib/src/main/java/com/junkchen/blelib/BleService.java

@@ -27,6 +27,8 @@
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanResult;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -173,28 +175,31 @@ public void scanLeDevice(final boolean enable, long scanPeriod) {
                 @Override
                 public void run() {
                     isScanning = false;
-                    mBluetoothAdapter.stopLeScan(mScanCallback);
-                    broadcastUpdate(ACTION_SCAN_FINISHED);
-                    if (mScanLeDeviceList != null) {
-                        mScanLeDeviceList.clear();
-                        mScanLeDeviceList = null;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        mBluetoothAdapter.getBluetoothLeScanner().stopScan(mScanCallback);
+                    } else {
+                        mBluetoothAdapter.stopLeScan(mLeScanCallback);
                     }
-//                    mBluetoothAdapter.getBluetoothLeScanner().stopScan(mLeScanCallback);
+                    broadcastUpdate(ACTION_SCAN_FINISHED);
+                    mScanLeDeviceList.clear();
                 }
             }, scanPeriod);
             mScanLeDeviceList.clear();
             isScanning = true;
-            mBluetoothAdapter.startLeScan(mScanCallback);
-//            mBluetoothAdapter.getBluetoothLeScanner().startScan(mLeScanCallback);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                mBluetoothAdapter.getBluetoothLeScanner().startScan(mScanCallback);
+            } else {
+                mBluetoothAdapter.startLeScan(mLeScanCallback);
+            }
         } else {
             isScanning = false;
-            mBluetoothAdapter.stopLeScan(mScanCallback);
-            broadcastUpdate(ACTION_SCAN_FINISHED);
-            if (mScanLeDeviceList != null) {
-                mScanLeDeviceList.clear();
-                mScanLeDeviceList = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                mBluetoothAdapter.getBluetoothLeScanner().stopScan(mScanCallback);
+            } else {
+                mBluetoothAdapter.stopLeScan(mLeScanCallback);
             }
-//            mBluetoothAdapter.getBluetoothLeScanner().stopScan(mLeScanCallback);
+            broadcastUpdate(ACTION_SCAN_FINISHED);
+            mScanLeDeviceList.clear();
         }
     }
 
@@ -216,15 +221,6 @@ public boolean isScanning() {
         return isScanning;
     }
 
-    /**
-     * Get scan ble devices
-     *
-     * @return scan le device list
-     */
-    public List<BluetoothDevice> getScanLeDevice() {
-        return mScanLeDeviceList;
-    }
-
     /**
      * Connects to the GATT server hosted on the Bluetooth LE device.
      *
@@ -503,6 +499,7 @@ public boolean readRemoteRssi() {
      * whether this operation was successful.
      *
      * <p>Requires {@link Manifest.permission#BLUETOOTH} permission.
+     *
      * @param mtu mtu
      * @return true, if the new MTU value has been requested successfully
      */
@@ -545,26 +542,47 @@ public List<BluetoothDevice> getConnectDevices() {
     }
 
     /**
-     * Device scan callback
+     * Device scan callback.
+     * <p>
+     * Use mScanCallback if Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP,
+     * else use mLeScanCallback.
      */
-    private final BluetoothAdapter.LeScanCallback mScanCallback = new BluetoothAdapter.LeScanCallback() {
-        @Override
-        public void onLeScan(BluetoothDevice device, int rssi, byte[] scanRecord) {
-            if (device == null || mScanLeDeviceList.contains(device)) return;
-            mScanLeDeviceList.add(device);
-            if (mOnLeScanListener != null) {
-                mOnLeScanListener.onLeScan(device, rssi, scanRecord);
-            }
-            broadcastUpdate(ACTION_BLUETOOTH_DEVICE, device);
-        }
-    };
+    private ScanCallback mScanCallback;
+    private BluetoothAdapter.LeScanCallback mLeScanCallback;
 
-    /*private final ScanCallback mLeScanCallback = new ScanCallback() {
-        @Override
-        public void onScanResult(int callbackType, ScanResult result) {
-            super.onScanResult(callbackType, result);
+    {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mScanCallback = new ScanCallback() {
+                @Override
+                public void onScanResult(int callbackType, ScanResult result) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        if (mScanLeDeviceList.contains(result.getDevice())) return;
+                        mScanLeDeviceList.add(result.getDevice());
+                        if (mOnLeScanListener != null) {
+                            mOnLeScanListener.onLeScan(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes());
+                        }
+                        broadcastUpdate(ACTION_BLUETOOTH_DEVICE, result.getDevice());
+                        Log.i(TAG, "onScanResult: name: " + result.getDevice().getName() +
+                                ", address: " + result.getDevice().getAddress() +
+                                ", rssi: " + result.getRssi() + ", scanRecord: " + result.getScanRecord());
+                    }
+                }
+            };
+        } else {
+            mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
+                @Override
+                public void onLeScan(BluetoothDevice device, int rssi, byte[] scanRecord) {
+                    Log.i(TAG, "device name: " + device.getName() + ", address: " + device.getAddress());
+                    if (device == null || mScanLeDeviceList.contains(device)) return;
+                    mScanLeDeviceList.add(device);
+                    if (mOnLeScanListener != null) {
+                        mOnLeScanListener.onLeScan(device, rssi, scanRecord);
+                    }
+                    broadcastUpdate(ACTION_BLUETOOTH_DEVICE, device);
+                }
+            };
         }
-    };*/
+    }
 
     /**
      * Implements callback methods for GATT events that the app cares about.  For example,