From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择

---
 app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 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 9e00673..913fd46 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,10 +102,13 @@
                     /**
                      * ���������������������������������������
                      */
-                    if(MainApp.theApp.bleManager!=null&&MainApp.theApp.bleManager.isConnected()){
-                        mBluetoothService.closeConnect();
+                    if (MainApp.theApp.bleManager != null) {
+                        MainApp.theApp.bleManager.closeBluetoothGatt();
                     }
                     mBluetoothService.connectDevice(scanResultList.get(position));
+                    EventMessage eventMessage = new EventMessage();
+                    eventMessage.setType(AppConfig.BLUETOOCH_CHANGE_CONNECT);
+                    EventBus.getDefault().post(eventMessage);
                 }
             }
 
@@ -113,7 +121,8 @@
 
     @Override
     protected void initListener() {
-        iv_search.setOnClickListener(this);
+//        iv_search.setOnClickListener(this);
+        iv_searchpic.setOnClickListener(this);
     }
 
     @Override
@@ -124,7 +133,8 @@
     @Override
     protected void processClick(View view) {
         switch (view.getId()) {
-            case R.id.iv_search:
+            case R.id.iv_searchpic:
+                mBluetoothService.openBlueTooth();
                 if (isScan) {
                     if (mBluetoothService != null) {
                         mBluetoothService.cancelScan();
@@ -156,6 +166,7 @@
     }
 
     private void unbindService() {
+//        mBluetoothService.setScanCallback(null);
         this.unbindService(mFhrSCon);
     }
 
@@ -169,7 +180,11 @@
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
-            mBluetoothService = null;
+            if (mBluetoothService != null) {
+                mBluetoothService.cancelScan();
+                mBluetoothService.closeConnect();
+                mBluetoothService = null;
+            }
         }
     };
 
@@ -196,29 +211,46 @@
 
         @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().postSticky(msg);
-            finish();
+            if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
+                progressDialog.dismiss();
+                finish();
+            }
         }
     };
 

--
Gitblit v1.8.0