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/ble/BluetoothService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java b/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
index 81f7872..de3d4bc 100644
--- a/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
+++ b/app/src/main/java/com/moral/yunfushao/ble/BluetoothService.java
@@ -154,6 +154,12 @@
mCallback.onConnecting();
}
+ System.out.println("chenqi blename old = "+ MainApp.theApp.sharedPreferencesUtil.getBLE());
+
+ System.out.println("chenqi blename = "+ scanResult.getDevice().getAddress());
+
+ openBlueTooth();
+
bleManager.connectDevice(scanResult, false, new BleGattCallback() {
@Override
@@ -561,6 +567,8 @@
mCallback.onStartScan();
}
+ openBlueTooth();
+
bleManager.scanMacAndConnect(mac, 5000, false, new BleGattCallback() {
@Override
public void onFoundDevice(ScanResult scanResult) {
@@ -590,6 +598,7 @@
@Override
public void onConnectError(BleException exception) {
+ System.out.println("chenqi chenqi" + exception.getDescription()) ;
runOnMainThread(new Runnable() {
@Override
public void run() {
@@ -731,5 +740,9 @@
}
}
-
+ public void openBlueTooth() {
+ if (bleManager != null) {
+ bleManager.enableBluetooth();
+ }
+ }
}
--
Gitblit v1.8.0