From 17d97f58265510ceda0b38959a90424ee07b6910 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 11:42:07 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
app/src/main/java/com/moral/yunfushao/MainActivity.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/MainActivity.java b/app/src/main/java/com/moral/yunfushao/MainActivity.java
index 3887a73..6ba2e11 100644
--- a/app/src/main/java/com/moral/yunfushao/MainActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -72,7 +72,7 @@
private int index = 0;
private boolean islogin = false;
- private BluetoothService mBluetoothService;
+ public static BluetoothService mBluetoothService;
@Override
protected void getBundleExtras(Bundle extras) {
@@ -85,10 +85,15 @@
}
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ protected void onStart() {
+ super.onStart();
bindService();
PermissionUtil.verifyStoragePermissions(this);
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
}
@Override
@@ -315,6 +320,7 @@
mBluetoothService = ((BluetoothService.BluetoothBinder) service).getService();
mBluetoothService.setScanCallback(callback);
String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
+ System.out.println("BleGattCallback init");
if (!TextUtils.isEmpty(mac)) {
mBluetoothService.scanAndConnect5(mac);
}
@@ -322,6 +328,7 @@
@Override
public void onServiceDisconnected(ComponentName name) {
+ System.out.println("BleGattCallback onServiceDisconnected");
mBluetoothService = null;
}
};
@@ -329,29 +336,32 @@
private BluetoothService.Callback callback = new BluetoothService.Callback() {
@Override
public void onStartScan() {
-
+ System.out.println("MainActivity onStartScan");
}
@Override
public void onScanning(ScanResult result) {
-
+ System.out.println("MainActivity onScanning");
}
@Override
public void onScanComplete() {
-
+ System.out.println("MainActivity onScanComplete");
}
@Override
public void onConnecting() {
+ System.out.println("MainActivity onConnecting");
+
progressDialog.setTitleText("������������...");
progressDialog.show();
}
@Override
public void onConnectFail() {
+ System.out.println("MainActivity onConnectFail");
progressDialog.dismiss();
- mToatUtils.showSingletonToast("������������");
+ mBluetoothService.closeConnect();
EventMessage msg = new EventMessage();
msg.setType(AppConfig.GET_BLE_DISCONNECT);
EventBus.getDefault().postSticky(msg);
@@ -359,6 +369,7 @@
@Override
public void onDisConnected() {
+ System.out.println("MainActivity onDisConnected");
progressDialog.dismiss();
mToatUtils.showSingletonToast("���������������������");
EventMessage msg = new EventMessage();
@@ -368,6 +379,7 @@
@Override
public void onServicesDiscovered() {
+ System.out.println("MainActivity onServicesDiscovered");
progressDialog.dismiss();
EventMessage msg = new EventMessage();
msg.setType(AppConfig.GET_BLE_SERVICE);
--
Gitblit v1.8.0