From 8e9d0834e4f5328efca969156af81a41fa99dce9 Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Fri, 20 Apr 2018 16:14:14 +0800
Subject: [PATCH] 提交
---
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 59cc093..313b3f7 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -8,12 +8,14 @@
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;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -21,6 +23,8 @@
import com.clj.fastble.data.ScanResult;
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
import com.moral.andbrickslib.baseadapter.recyclerview.MultiItemTypeAdapter;
+import com.moral.andbrickslib.utils.ActivityManager;
+import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.BleDeviceAdapter;
import com.moral.yunfushao.base.BaseActivity;
@@ -64,6 +68,9 @@
super.onDestroy();
if (mBluetoothService != null)
unbindService();
+ EventMessage msg = new EventMessage();
+ msg.setType(AppConfig.SET_MAIN_CALL);
+ EventBus.getDefault().postSticky(msg);
}
@Override
@@ -93,6 +100,12 @@
*/
if (mBluetoothService != null) {
mBluetoothService.cancelScan();
+ /**
+ * ���������������������������������������
+ */
+ if (MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isConnected()) {
+ mBluetoothService.closeConnect();
+ }
mBluetoothService.connectDevice(scanResultList.get(position));
}
}
@@ -149,6 +162,7 @@
}
private void unbindService() {
+// mBluetoothService.setScanCallback(null);
this.unbindService(mFhrSCon);
}
@@ -189,29 +203,47 @@
@Override
public void onConnecting() {
- progressDialog.setTitleText("������������...");
- progressDialog.show();
+ if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
+ progressDialog.setTitleText("������������...");
+ progressDialog.show();
+ }
}
@Override
public void onConnectFail() {
- progressDialog.dismiss();
+ if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
+ progressDialog.dismiss();
+ }
+ Log.d("chonglian","������������");
mToatUtils.showSingletonToast("������������");
+ EventMessage msg = new EventMessage();
+ msg.setType(AppConfig.GET_BLE_DISCONNECT);
+ EventBus.getDefault().postSticky(msg);
}
@Override
public void onDisConnected() {
- progressDialog.dismiss();
- mToatUtils.showSingletonToast("������������");
+ if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
+ progressDialog.dismiss();
+ }
+ Log.d("chonglian","���������������������");
+ mToatUtils.showSingletonToast("���������������������");
+ EventMessage msg = new EventMessage();
+ msg.setType(AppConfig.GET_BLE_DISCONNECT);
+ EventBus.getDefault().postSticky(msg);
}
@Override
public void onServicesDiscovered() {
- progressDialog.dismiss();
+ Log.d("chonglian","���������������������");
EventMessage msg = new EventMessage();
msg.setType(AppConfig.GET_BLE_SERVICE);
- EventBus.getDefault().post(msg);
- finish();
+ EventBus.getDefault().postSticky(msg);
+ if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
+ progressDialog.dismiss();
+ finish();
+ }
+
}
};
--
Gitblit v1.8.0