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/activity/BLESearchActivity.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
index 6d0d0c4..bceeb16 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -8,7 +8,6 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.IBinder;
-import android.os.Message;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
@@ -106,7 +105,7 @@
if (MainApp.theApp.bleManager != null) {
MainApp.theApp.bleManager.closeBluetoothGatt();
}
- mBluetoothService.connectDevice(scanResultList.get(position));
+ mBluetoothService.scanAndConnect5(scanResultList.get(position).getDevice().getAddress());
}
}
@@ -176,7 +175,11 @@
@Override
public void onServiceDisconnected(ComponentName name) {
- mBluetoothService = null;
+ if (mBluetoothService != null) {
+ mBluetoothService.cancelScan();
+ mBluetoothService.closeConnect();
+ mBluetoothService = null;
+ }
}
};
@@ -226,7 +229,7 @@
if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
progressDialog.dismiss();
}
- Log.d("chonglian","���������������������");
+ Log.d("chonglian", "���������������������");
mToatUtils.showSingletonToast("���������������������");
EventMessage msg = new EventMessage();
msg.setType(AppConfig.GET_BLE_DISCONNECT);
@@ -235,7 +238,7 @@
@Override
public void onServicesDiscovered() {
- Log.d("chonglian","���������������������");
+ Log.d("chonglian", "���������������������");
EventMessage msg = new EventMessage();
msg.setType(AppConfig.GET_BLE_SERVICE);
EventBus.getDefault().postSticky(msg);
--
Gitblit v1.8.0