update 2.4.0

Jasonchenlijian · Sep 13, 2021 · 9e18f1f · 9e18f1f
1 parent 384e7ce
commit 9e18f1f
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 982 deletions.
diff --git a/FastBLE-2.4.0.aar b/FastBLE-2.4.0.aar
diff --git a/FastBleLib/build.gradle b/FastBleLib/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 30
-        versionCode 234
-        versionName "2.3.4"
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode rootProject.ext.versionControl.versionCode
+        versionName rootProject.ext.versionControl.versonName
     }
     buildTypes {
         release {
@@ -21,3 +21,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
+
+task makeAAR(type: Copy) {
+    from('build/outputs/aar/')
+    into('build/aarFloder/')
+    include('FastBleLib-release.aar')
+    rename ('FastBleLib-release.aar', 'FastBLE-' + rootProject.ext.versionControl.versonName + '.aar' )
+}
+makeAAR.dependsOn(build)
diff --git a/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java b/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java
@@ -41,16 +41,16 @@ public class BleBluetooth {
     private BleGattCallback bleGattCallback;
     private BleRssiCallback bleRssiCallback;
     private BleMtuChangedCallback bleMtuChangedCallback;
-    private HashMap<String, BleNotifyCallback> bleNotifyCallbackHashMap = new HashMap<>();
-    private HashMap<String, BleIndicateCallback> bleIndicateCallbackHashMap = new HashMap<>();
-    private HashMap<String, BleWriteCallback> bleWriteCallbackHashMap = new HashMap<>();
-    private HashMap<String, BleReadCallback> bleReadCallbackHashMap = new HashMap<>();
+    private final HashMap<String, BleNotifyCallback> bleNotifyCallbackHashMap = new HashMap<>();
+    private final HashMap<String, BleIndicateCallback> bleIndicateCallbackHashMap = new HashMap<>();
+    private final HashMap<String, BleWriteCallback> bleWriteCallbackHashMap = new HashMap<>();
+    private final HashMap<String, BleReadCallback> bleReadCallbackHashMap = new HashMap<>();
 
     private LastState lastState;
     private boolean isActiveDisconnect = false;
-    private BleDevice bleDevice;
+    private final BleDevice bleDevice;
     private BluetoothGatt bluetoothGatt;
-    private MainHandler mainHandler = new MainHandler(Looper.getMainLooper());
+    private final MainHandler mainHandler = new MainHandler(Looper.getMainLooper());
     private int connectRetryCount = 0;
 
     public BleBluetooth(BleDevice bleDevice) {
@@ -106,14 +106,10 @@ public synchronized void removeReadCallback(String uuid) {
     }
 
     public synchronized void clearCharacterCallback() {
-        if (bleNotifyCallbackHashMap != null)
-            bleNotifyCallbackHashMap.clear();
-        if (bleIndicateCallbackHashMap != null)
-            bleIndicateCallbackHashMap.clear();
-        if (bleWriteCallbackHashMap != null)
-            bleWriteCallbackHashMap.clear();
-        if (bleReadCallbackHashMap != null)
-            bleReadCallbackHashMap.clear();
+        bleNotifyCallbackHashMap.clear();
+        bleIndicateCallbackHashMap.clear();
+        bleWriteCallbackHashMap.clear();
+        bleReadCallbackHashMap.clear();
     }
 
     public synchronized void addRssiCallback(BleRssiCallback callback) {

diff --git a/FastBleLib/src/main/java/com/clj/fastble/bluetooth/SplitWriter.java b/FastBleLib/src/main/java/com/clj/fastble/bluetooth/SplitWriter.java
@@ -125,32 +125,6 @@ private void release() {
         mHandler.removeCallbacksAndMessages(null);
     }
 
-//    private static Queue<byte[]> splitByte(byte[] data, int count) {
-//        if (count > 20) {
-//            BleLog.w("Be careful: split count beyond 20! Ensure MTU higher than 23!");
-//        }
-//        Queue<byte[]> byteQueue = new LinkedList<>();
-//        if (data != null) {
-//            int index = 0;
-//            do {
-//                byte[] rawData = new byte[data.length - index];
-//                byte[] newData;
-//                System.arraycopy(data, index, rawData, 0, data.length - index);
-//                if (rawData.length <= count) {
-//                    newData = new byte[rawData.length];
-//                    System.arraycopy(rawData, 0, newData, 0, rawData.length);
-//                    index += rawData.length;
-//                } else {
-//                    newData = new byte[count];
-//                    System.arraycopy(data, index, newData, 0, count);
-//                    index += count;
-//                }
-//                byteQueue.offer(newData);
-//            } while (index < data.length);
-//        }
-//        return byteQueue;
-//    }
-
     private static Queue<byte[]> splitByte(byte[] data, int count) {
         if (count > 20) {
             BleLog.w("Be careful: split count beyond 20! Ensure MTU higher than 23!");

diff --git a/FastBleLib/src/main/java/com/clj/fastble/data/BleConnectStateParameter.java b/FastBleLib/src/main/java/com/clj/fastble/data/BleConnectStateParameter.java
@@ -6,7 +6,6 @@ public class BleConnectStateParameter {
     private int status;
     private boolean isActive;
 
-
     public BleConnectStateParameter(int status) {
         this.status = status;
     }

diff --git a/FastBleLib/src/main/java/com/clj/fastble/data/BleDevice.java b/FastBleLib/src/main/java/com/clj/fastble/data/BleDevice.java
@@ -57,20 +57,23 @@ public BleDevice[] newArray(int size) {
     };
 
     public String getName() {
-        if (mDevice != null)
+        if (mDevice != null) {
             return mDevice.getName();
+        }
         return null;
     }
 
     public String getMac() {
-        if (mDevice != null)
+        if (mDevice != null) {
             return mDevice.getAddress();
+        }
         return null;
     }
 
     public String getKey() {
-        if (mDevice != null)
+        if (mDevice != null) {
             return mDevice.getName() + mDevice.getAddress();
+        }
         return "";
     }
 

diff --git a/FastBleLib/src/main/java/com/clj/fastble/data/BleMsg.java b/FastBleLib/src/main/java/com/clj/fastble/data/BleMsg.java
@@ -4,7 +4,6 @@
 
 public class BleMsg {
 
-
     // Scan
     public static final int MSG_SCAN_DEVICE = 0X00;
 

diff --git a/FastBleLib/src/main/java/com/clj/fastble/data/BleScanState.java b/FastBleLib/src/main/java/com/clj/fastble/data/BleScanState.java
@@ -1,7 +1,6 @@
 package com.clj.fastble.data;
 
 
-
 public enum BleScanState {
 
     STATE_IDLE(-1),

diff --git a/FastBleLib/src/main/java/com/clj/fastble/scan/BleScanPresenter.java b/FastBleLib/src/main/java/com/clj/fastble/scan/BleScanPresenter.java
@@ -32,9 +32,9 @@ public abstract class BleScanPresenter implements BluetoothAdapter.LeScanCallbac
     private long mScanTimeout;
     private BleScanPresenterImp mBleScanPresenterImp;
 
-    private List<BleDevice> mBleDeviceList = new ArrayList<>();
+    private final List<BleDevice> mBleDeviceList = new ArrayList<>();
 
-    private Handler mMainHandler = new Handler(Looper.getMainLooper());
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
     private HandlerThread mHandlerThread;
     private Handler mHandler;
     private boolean mHandling;

diff --git a/FastBleLib/src/main/java/com/clj/fastble/scan/BleScanner.java b/FastBleLib/src/main/java/com/clj/fastble/scan/BleScanner.java
@@ -30,7 +30,7 @@ private static class BleScannerHolder {
 
     private BleScanState mBleScanState = BleScanState.STATE_IDLE;
 
-    private BleScanPresenter mBleScanPresenter = new BleScanPresenter() {
+    private final BleScanPresenter mBleScanPresenter = new BleScanPresenter() {
 
         @Override
         public void onScanStarted(boolean success) {

diff --git a/FastBleLib/src/main/java/com/clj/fastble/utils/BleLog.java b/FastBleLib/src/main/java/com/clj/fastble/utils/BleLog.java
@@ -6,7 +6,7 @@
 public final class BleLog {
 
     public static boolean isPrint = true;
-    private static String defaultTag = "FastBle";
+    private static final String defaultTag = "FastBle";
 
     public static void d(String msg) {
         if (isPrint && msg != null)

diff --git a/FastBleLib/src/main/java/com/clj/fastble/utils/HexUtil.java b/FastBleLib/src/main/java/com/clj/fastble/utils/HexUtil.java
@@ -63,7 +63,6 @@ public static String formatHexString(byte[] data, boolean addSpace) {
     }
 
     public static byte[] decodeHex(char[] data) {
-
         int len = data.length;
 
         if ((len & 0x01) != 0) {

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Android Bluetooth Low Energy
 - Support configuration timeout for conncet or operation  
 
 
-# Preview
+### Preview
 ![Preview_1](https://github.com/Jasonchenlijian/FastBle/raw/master/preview/new_1.png) 
 ![Preview_2](https://github.com/Jasonchenlijian/FastBle/raw/master/preview/new_2.png) 
 ![Preview_3](https://github.com/Jasonchenlijian/FastBle/raw/master/preview/new_3.png)
@@ -42,7 +42,7 @@ If you want to quickly preview all the functions, you can download APK as a test
 
 ### Jar
 
-[FastBLE-2.3.4.jar](https://github.com/Jasonchenlijian/FastBle/raw/master/FastBLE-2.3.4.jar) 
+[FastBLE-2.4.0.jar](https://github.com/Jasonchenlijian/FastBle/raw/master/FastBLE-2.4.0.jar)
 
 
 ## Wiki
@@ -53,7 +53,7 @@ If you want to quickly preview all the functions, you can download APK as a test
 
 
 
-# Usage
+## Usage
 
 - #### Init
 
@@ -533,7 +533,7 @@ If you want to quickly preview all the functions, you can download APK as a test
 ## Contact
 If you have problems and ideas to communicate with me, you can contact me in the following ways.
 
-QQ： 1033526540
+WeChat： chenlijian1216
 
 Email： [email protected]