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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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 a97f02c..913fd46 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -105,10 +105,10 @@
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);
- mBluetoothService.connectDevice(scanResultList.get(position));
}
}
@@ -121,7 +121,8 @@
@Override
protected void initListener() {
- iv_search.setOnClickListener(this);
+// iv_search.setOnClickListener(this);
+ iv_searchpic.setOnClickListener(this);
}
@Override
@@ -132,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();
@@ -249,7 +251,6 @@
progressDialog.dismiss();
finish();
}
-
}
};
--
Gitblit v1.8.0