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 | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..913fd46 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;
@@ -107,6 +106,9 @@
MainApp.theApp.bleManager.closeBluetoothGatt();
}
mBluetoothService.connectDevice(scanResultList.get(position));
+ EventMessage eventMessage = new EventMessage();
+ eventMessage.setType(AppConfig.BLUETOOCH_CHANGE_CONNECT);
+ EventBus.getDefault().post(eventMessage);
}
}
@@ -119,7 +121,8 @@
@Override
protected void initListener() {
- iv_search.setOnClickListener(this);
+// iv_search.setOnClickListener(this);
+ iv_searchpic.setOnClickListener(this);
}
@Override
@@ -130,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();
@@ -176,7 +180,11 @@
@Override
public void onServiceDisconnected(ComponentName name) {
- mBluetoothService = null;
+ if (mBluetoothService != null) {
+ mBluetoothService.cancelScan();
+ mBluetoothService.closeConnect();
+ mBluetoothService = null;
+ }
}
};
@@ -226,7 +234,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 +243,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);
@@ -243,7 +251,6 @@
progressDialog.dismiss();
finish();
}
-
}
};
--
Gitblit v1.8.0