From fc9dc236266700d61e3538bee669f2f4abb242f2 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 14:14:22 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java | 2 +-
.gradle/4.1/javaCompile/jarAnalysis.bin | 0
.gradle/4.1/fileHashes/fileHashes.lock | 0
.gradle/4.1/taskHistory/taskHistory.bin | 0
.gradle/4.1/javaCompile/classAnalysis.bin | 0
conf.gradle | 2 +-
.gradle/4.1/javaCompile/taskJars.bin | 0
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 12 +++---------
.gradle/4.1/fileHashes/fileHashes.bin | 0
.gradle/4.1/taskHistory/fileSnapshots.bin | 0
.gradle/4.1/javaCompile/javaCompile.lock | 0
.gradle/4.1/taskHistory/taskHistory.lock | 0
.gradle/4.1/fileHashes/resourceHashesCache.bin | 0
FastBleLib/src/main/java/com/clj/fastble/conn/BleConnector.java | 1 +
app/src/main/java/com/moral/yunfushao/MainActivity.java | 1 -
.gradle/4.1/javaCompile/taskHistory.bin | 0
app/build.gradle | 4 ++--
17 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
index 92d68df..f81da16 100644
--- a/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
index 92ef62a..645e5e8 100644
--- a/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/.gradle/4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.1/fileHashes/resourceHashesCache.bin
index f9b7cbf..3f8b815 100644
--- a/.gradle/4.1/fileHashes/resourceHashesCache.bin
+++ b/.gradle/4.1/fileHashes/resourceHashesCache.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
index 80286f3..57ffd28 100644
--- a/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/jarAnalysis.bin b/.gradle/4.1/javaCompile/jarAnalysis.bin
index 64afd1f..4702177 100644
--- a/.gradle/4.1/javaCompile/jarAnalysis.bin
+++ b/.gradle/4.1/javaCompile/jarAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
index 075ba56..c425b43 100644
--- a/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
index 5ba0a1f..eba225c 100644
--- a/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskJars.bin b/.gradle/4.1/javaCompile/taskJars.bin
index e24d6cf..60979af 100644
--- a/.gradle/4.1/javaCompile/taskJars.bin
+++ b/.gradle/4.1/javaCompile/taskJars.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
index 75e626b..e966fdf 100644
--- a/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
index 76cb865..f99be26 100644
--- a/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
index 1eac5d6..c4392ca 100644
--- a/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
diff --git a/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java b/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java
index a0abb9a..3e62bef 100644
--- a/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java
+++ b/FastBleLib/src/main/java/com/clj/fastble/bluetooth/BleBluetooth.java
@@ -435,7 +435,6 @@
Map.Entry entry = (Map.Entry) iterator.next();
Object call = entry.getValue();
if (call instanceof BluetoothGattCallback) {
- gatt.requestMtu(64);
((BluetoothGattCallback) call).onServicesDiscovered(gatt, status);
}
}
@@ -476,6 +475,7 @@
Map.Entry entry = (Map.Entry) iterator.next();
Object call = entry.getValue();
if (call instanceof BluetoothGattCallback) {
+ gatt.requestMtu(64);
((BluetoothGattCallback) call).onCharacteristicChanged(gatt, characteristic);
}
}
diff --git a/FastBleLib/src/main/java/com/clj/fastble/conn/BleConnector.java b/FastBleLib/src/main/java/com/clj/fastble/conn/BleConnector.java
index e97e782..eb8bd2c 100644
--- a/FastBleLib/src/main/java/com/clj/fastble/conn/BleConnector.java
+++ b/FastBleLib/src/main/java/com/clj/fastble/conn/BleConnector.java
@@ -351,6 +351,7 @@
if (!msgRemoved.getAndSet(true)) {
handler.removeMessages(MSG_NOTIFY_CHA, this);
}
+
if (characteristic.getUuid().equals(UUID.fromString(uuid_notify))) {
System.out.println("chenqi Hex ->" + dumpHex(characteristic.getValue()));
bleCallback.onSuccess(characteristic);
diff --git a/app/build.gradle b/app/build.gradle
index 7d96e13..3b25094 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,11 +35,11 @@
}
}
//���������������
- //3.0������
+ //6.0������
android.applicationVariants.all { variant ->
variant.outputs.all {
if (buildType.name == "debug")
- outputFileName = "Dev_yfs_v.${variant.versionName}.apk"
+ outputFileName = "Dev_yfs_v.${variant.versionName}${rootProject.ext.android.debugVersion}.apk"
else outputFileName = "yfs_v.${variant.versionName}.apk"
}
}
diff --git a/app/src/main/java/com/moral/yunfushao/MainActivity.java b/app/src/main/java/com/moral/yunfushao/MainActivity.java
index 6ba2e11..ccc4547 100644
--- a/app/src/main/java/com/moral/yunfushao/MainActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -352,7 +352,6 @@
@Override
public void onConnecting() {
System.out.println("MainActivity onConnecting");
-
progressDialog.setTitleText("������������...");
progressDialog.show();
}
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index 86ef576..6c4ee08 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -55,7 +55,6 @@
import com.moral.yunfushao.ui.PanelView;
import com.moral.yunfushao.utils.AudioUtils;
import com.moral.yunfushao.utils.DebugUtils;
-import com.moral.yunfushao.utils.T;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -136,7 +135,6 @@
private Runnable reconnectRunnable = new Runnable() {
@Override
public void run() {
- System.out.println("chenqi ������������");
//������
if (mBluetoothService == null) {
return;
@@ -259,7 +257,7 @@
}
});
//������handler
- resetHandler();
+ HEARTTIMES = 2;
//������������
heart();
}
@@ -348,15 +346,13 @@
public void onResume() {
super.onResume();
isMySelfPage = true;
- reconnect();
textShowMac();
}
@Override
public void onPause() {
super.onPause();
- //������������������������
- T.show("onPause");
+ System.out.println("chenqi onPause");
isMySelfPage = false;
stopReconnect();
}
@@ -364,6 +360,7 @@
@Override
public void onDestroy() {
super.onDestroy();
+ System.out.println("chenqi onDestroy");
EventBus.getDefault().unregister(this);
if (timer != null) {
timer.cancel();
@@ -526,14 +523,11 @@
handler.postDelayed(reconnectRunnable, 0);
}
}
-
/**
* ������������
*/
private void stopReconnect() {
handler.removeCallbacks(reconnectRunnable);
- if (mBluetoothService != null)
- mBluetoothService.closeConnect();
}
private void resetHandler() {
diff --git a/conf.gradle b/conf.gradle
index 7508977..79bf9c2 100644
--- a/conf.gradle
+++ b/conf.gradle
@@ -6,7 +6,7 @@
versionName : "1.0.3.1",
minSdkVersion : 21,
targetSdkVersion : 25,
- debugVersion : "sp1",
+ debugVersion : "_sp1",
]
dependencies = [
--
Gitblit v1.8.0