From 75e83be13a8c4ccf081c4dc07a262e4096783c7e Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 02 Nov 2018 17:34:21 +0800
Subject: [PATCH] [*]修改电磁版本 配合电子修改bug

---
 app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 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 d4ded7d..a97f02c 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -14,6 +14,7 @@
 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 +22,7 @@
 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;
@@ -65,6 +67,9 @@
         super.onDestroy();
         if (mBluetoothService != null)
             unbindService();
+        EventMessage msg = new EventMessage();
+        msg.setType(AppConfig.SET_MAIN_CALL);
+        EventBus.getDefault().postSticky(msg);
     }
 
     @Override
@@ -97,9 +102,12 @@
                     /**
                      * ���������������������������������������
                      */
-                    if(MainApp.theApp.bleManager!=null&&MainApp.theApp.bleManager.isConnected()){
-                        mBluetoothService.closeConnect();
+                    if (MainApp.theApp.bleManager != null) {
+                        MainApp.theApp.bleManager.closeBluetoothGatt();
                     }
+                    EventMessage eventMessage = new EventMessage();
+                    eventMessage.setType(AppConfig.BLUETOOCH_CHANGE_CONNECT);
+                    EventBus.getDefault().post(eventMessage);
                     mBluetoothService.connectDevice(scanResultList.get(position));
                 }
             }
@@ -156,6 +164,7 @@
     }
 
     private void unbindService() {
+//        mBluetoothService.setScanCallback(null);
         this.unbindService(mFhrSCon);
     }
 
@@ -169,7 +178,11 @@
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
-            mBluetoothService = null;
+            if (mBluetoothService != null) {
+                mBluetoothService.cancelScan();
+                mBluetoothService.closeConnect();
+                mBluetoothService = null;
+            }
         }
     };
 
@@ -196,29 +209,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