From cdbaf79d124d46b69dc62b653fde55f9d40b5534 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 01 Nov 2018 17:23:32 +0800
Subject: [PATCH] [*]修改电磁版本
---
app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java b/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
index b5bc98a..1c2a716 100644
--- a/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
+++ b/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
@@ -39,12 +39,13 @@
@Override
public void onCreate() {
- if( MainApp.theApp.bleManager!=null){
+ if (MainApp.theApp.bleManager != null) {
bleManager = MainApp.theApp.bleManager;
- }else{
+ } else {
bleManager = new BleManager(MainApp.theApp);
MainApp.theApp.bleManager = bleManager;
}
+ bleManager.setMtu(128);//���������������������������������������
bleManager.enableBluetooth();
}
@@ -144,8 +145,8 @@
}
public void cancelScan() {
- if(bleManager!=null)
- bleManager.cancelScan();
+ if (bleManager != null)
+ bleManager.cancelScan();
}
public void connectDevice(final ScanResult scanResult) {
@@ -153,7 +154,10 @@
mCallback.onConnecting();
}
- bleManager.connectDevice(scanResult, true, new BleGattCallback() {
+ System.out.println("BleGattCallback setting " + scanResult.getDevice().getAddress());
+ System.out.println("Ble onconnectSuccess");
+
+ bleManager.connectDevice(scanResult, false, new BleGattCallback() {
@Override
public void onFoundDevice(ScanResult scanResult) {
@@ -180,9 +184,10 @@
@Override
public void onConnectSuccess(BluetoothGatt gatt, int status) {
- //���������������������������������MAC
- MainApp.theApp.sharedPreferencesUtil.saveBLE(gatt.getDevice().getAddress());
+ //���������������������������������MAC
+ MainApp.theApp.sharedPreferencesUtil.saveBLE(gatt.getDevice().getAddress());
}
+
@Override
public void onServicesDiscovered(final BluetoothGatt gatt, int status) {
BluetoothService.this.gatt = gatt;
@@ -555,7 +560,6 @@
}
bleManager.scanMacAndConnect(mac, 5000, false, new BleGattCallback() {
-
@Override
public void onFoundDevice(ScanResult scanResult) {
runOnMainThread(new Runnable() {
@@ -580,7 +584,6 @@
@Override
public void onConnecting(BluetoothGatt gatt, int status) {
-
}
@Override
@@ -597,7 +600,6 @@
@Override
public void onConnectSuccess(BluetoothGatt gatt, int status) {
-
}
@Override
--
Gitblit v1.8.0