修改连接方法,增加更多的连接方式,优化连接出现133的问题

yinbao · Jul 20, 2022 · 105a7bb · 105a7bb
1 parent 8e52973
commit 105a7bb
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 64 deletions.
diff --git a/app/src/main/java/com/xing/XBle/PhoneCentralActivity.java b/app/src/main/java/com/xing/XBle/PhoneCentralActivity.java
@@ -1,6 +1,7 @@
 package com.xing.XBle;
 
 import android.Manifest;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Context;
@@ -23,6 +24,12 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import com.xing.xblelibrary.XBleManager;
 import com.xing.xblelibrary.bean.BleBroadcastBean;
 import com.xing.xblelibrary.config.XBleStaticConfig;
@@ -37,12 +44,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
 /**
  * xing<br>
  * 2021/8/2<br>
@@ -114,7 +115,12 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 BleBroadcastBean bleBroadcastBean = mListBle.get(position);
                 mConnectMac = bleBroadcastBean.getMac();
                 XBleManager.getInstance().stopScan();
-                XBleManager.getInstance().connectDevice(mConnectMac);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    //可以优化连接BLE 4.0出现133的问题
+                    XBleManager.getInstance().connectDevice(mConnectMac, BluetoothDevice.TRANSPORT_LE);
+                }else {
+                    XBleManager.getInstance().connectDevice(mConnectMac);
+                }
             }
         });
 

diff --git a/xblelibrary/build.gradle b/xblelibrary/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 13
-        versionName "2.1.5"
+        versionCode 14
+        versionName "2.1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/xblelibrary/src/main/java/com/xing/xblelibrary/XBleManager.java b/xblelibrary/src/main/java/com/xing/xblelibrary/XBleManager.java
@@ -1,13 +1,18 @@
 package com.xing.xblelibrary;
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Build;
 import android.os.IBinder;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.xing.xblelibrary.bean.AdBleBroadcastBean;
 import com.xing.xblelibrary.bean.BleBroadcastBean;
 import com.xing.xblelibrary.config.XBleConfig;
@@ -25,10 +30,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-
 /**
  * xing<br>
  * 2021/7/17<br>
@@ -190,7 +191,8 @@ private void onServiceSuccess() {
             if (autoConnectSystemBle) {
                 mXBleServer.autoConnectSystemBle();
             }
-            mXBleServer.setAutoMonitorSystemConnectBle(XBleConfig.getInstance().isAutoMonitorSystemConnectBle());
+            mXBleServer.setAutoMonitorSystemConnectBle(XBleConfig.getInstance()
+                    .isAutoMonitorSystemConnectBle());
         }
     }
 
@@ -243,6 +245,19 @@ public void connectDevice(BleBroadcastBean bleValueBean) {
     }
 
 
+    /**
+     * 连接设备
+     *
+     * @param bleValueBean BleValueBean
+     * @param transport    {@link BluetoothDevice#TRANSPORT_AUTO} or {@link BluetoothDevice#TRANSPORT_BREDR} or {@link  BluetoothDevice#TRANSPORT_LE}
+     */
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public void connectDevice(BleBroadcastBean bleValueBean, int transport) {
+        if (checkBluetoothServiceStatus()) {
+            mXBleServer.connectDevice(bleValueBean, transport);
+        }
+    }
+
     /**
      * 连接设备
      *
@@ -254,6 +269,18 @@ public void connectDevice(String mAddress) {
         }
     }
 
+    /**
+     * @param mAddress  mac地址
+     * @param transport {@link BluetoothDevice#TRANSPORT_AUTO} or {@link BluetoothDevice#TRANSPORT_BREDR} or {@link  BluetoothDevice#TRANSPORT_LE}
+     */
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public void connectDevice(String mAddress, int transport) {
+        if (checkBluetoothServiceStatus()) {
+            mXBleServer.connectDevice(mAddress, transport);
+        }
+    }
+
+
     /**
      * 断开指定mac地址的蓝牙连接,正在连接中的设备也会断开
      */

diff --git a/xblelibrary/src/main/java/com/xing/xblelibrary/bean/BleBroadcastBean.java b/xblelibrary/src/main/java/com/xing/xblelibrary/bean/BleBroadcastBean.java
@@ -6,16 +6,16 @@
 import android.os.Build;
 import android.os.ParcelUuid;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.xing.xblelibrary.utils.BleBroadcastUtils;
 import com.xing.xblelibrary.utils.XBleL;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-
 /**
  * 蓝牙广播内容bean<br>
  * 搜索到的外围设备
@@ -159,11 +159,7 @@ public boolean equals(@Nullable Object obj) {
     private boolean equals(BleBroadcastBean mBleValueBean) {
         BluetoothDevice mNewDevice = mBleValueBean.getDevice();
         if (mDevice != null) {
-            if (mDevice == mBleValueBean.getDevice() || equals(mNewDevice.getAddress())) {
-                return true;
-            } else {
-                return false;
-            }
+            return mDevice == mBleValueBean.getDevice() || equals(mNewDevice.getAddress());
         }
         return false;
     }
@@ -177,11 +173,7 @@ private boolean equals(BleBroadcastBean mBleValueBean) {
      */
     private boolean equals(String mBleAddress) {
         if (mDevice != null) {
-            if (mDevice.getAddress().equals(mBleAddress)) {
-                return true;
-            } else {
-                return false;
-            }
+            return mDevice.getAddress().equals(mBleAddress);
         }
         return false;
     }

diff --git a/xblelibrary/src/main/java/com/xing/xblelibrary/device/BleDevice.java b/xblelibrary/src/main/java/com/xing/xblelibrary/device/BleDevice.java
@@ -9,23 +9,23 @@
 import android.os.Looper;
 import android.os.Message;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.RequiresApi;
+
 import com.xing.xblelibrary.config.XBleStaticConfig;
+import com.xing.xblelibrary.listener.OnBleCharacteristicListener;
 import com.xing.xblelibrary.listener.OnBleMtuListener;
+import com.xing.xblelibrary.listener.OnBleNotifyDataListener;
 import com.xing.xblelibrary.listener.OnBleRssiListener;
 import com.xing.xblelibrary.listener.OnBleSendResultListener;
-import com.xing.xblelibrary.listener.OnBleCharacteristicListener;
-import com.xing.xblelibrary.listener.OnBleNotifyDataListener;
 import com.xing.xblelibrary.listener.onBleDisConnectedListener;
-import com.xing.xblelibrary.utils.XBleL;
 import com.xing.xblelibrary.utils.MyBleDeviceUtils;
+import com.xing.xblelibrary.utils.XBleL;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
-import androidx.annotation.CallSuper;
-import androidx.annotation.RequiresApi;
-
 /**
  * xing<br>
  * 2021/07/21<br>
@@ -127,7 +127,7 @@ public List<BluetoothGattCharacteristic> getBluetoothGattCharacteristicList(Blue
         return bleGattService.getCharacteristics();
     }
 
-    private void init() {
+    public void init() {
         //TODO 可进行所有模块都要进行的初始化操作
 
     }
@@ -388,7 +388,7 @@ public void descriptorWriteOk(BluetoothGattDescriptor descriptor) {
                 mOnCharacteristicListener.onDescriptorWriteOK(descriptor);
             }
         }
-        if (mLinkedListNotify != null && mLinkedListNotify.size() > 0) {
+        if (mLinkedListNotify.size() > 0) {
             mLinkedListNotify.removeLast();
             if (mLinkedListNotify.size() > 0) {
                 SendDataBean sendDataBean = mLinkedListNotify.getLast();