From 2c76ecbb7edf6e30f1dda4c930a02945c360ecab Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:18:57 +0800
Subject: [PATCH] [*]修改页面动画
---
app/src/main/java/com/moral/yunfushao/MainActivity.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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..e9c221c 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
@@ -137,7 +142,9 @@
@Override
protected void initData() {
- prepare();
+ //������������������
+ wxLoadingOutTime();
+// prepare();
if (MainApp.theApp.bleManager != null) {
if (MainApp.theApp.bleManager.isSupportBle()) {
MainApp.theApp.bleManager.enableBluetooth();
@@ -148,6 +155,13 @@
mToatUtils.showSingletonToast("���������������������������������BLE���");
}
getAd();
+ }
+
+ /**
+ * ���������������������������������
+ */
+ private void wxLoadingOutTime() {
+
}
@Override
@@ -315,6 +329,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 +337,7 @@
@Override
public void onServiceDisconnected(ComponentName name) {
+ System.out.println("BleGattCallback onServiceDisconnected");
mBluetoothService = null;
}
};
@@ -329,29 +345,31 @@
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 +377,7 @@
@Override
public void onDisConnected() {
+ System.out.println("MainActivity onDisConnected");
progressDialog.dismiss();
mToatUtils.showSingletonToast("���������������������");
EventMessage msg = new EventMessage();
@@ -368,6 +387,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