From 4203968ed148a7e56ab460c8d6edb744cb1645e4 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 07 Dec 2018 17:16:54 +0800
Subject: [PATCH] [*]优化微信登陆用户信息

---
 app/src/main/java/com/moral/yunfushao/MainActivity.java |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/moral/yunfushao/MainActivity.java b/app/src/main/java/com/moral/yunfushao/MainActivity.java
index 2740b3f..e9c221c 100644
--- a/app/src/main/java/com/moral/yunfushao/MainActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
@@ -43,6 +44,7 @@
 import com.moral.yunfushao.model.EventMessage;
 import com.moral.yunfushao.model.User;
 import com.moral.yunfushao.update.UpdateManager;
+import com.moral.yunfushao.utils.PermissionUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
@@ -70,7 +72,7 @@
     private int index = 0;
     private boolean islogin = false;
 
-    private BluetoothService mBluetoothService;
+    public static BluetoothService mBluetoothService;
 
     @Override
     protected void getBundleExtras(Bundle extras) {
@@ -83,9 +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
@@ -134,7 +142,9 @@
 
     @Override
     protected void initData() {
-        prepare();
+        //������������������
+        wxLoadingOutTime();
+//        prepare();
         if (MainApp.theApp.bleManager != null) {
             if (MainApp.theApp.bleManager.isSupportBle()) {
                 MainApp.theApp.bleManager.enableBluetooth();
@@ -145,6 +155,13 @@
             mToatUtils.showSingletonToast("���������������������������������BLE���");
         }
         getAd();
+    }
+
+    /**
+     * ���������������������������������
+     */
+    private void wxLoadingOutTime() {
+
     }
 
     @Override
@@ -210,6 +227,20 @@
             // Do not have permissions, request them now
             EasyPermissions.requestPermissions(this, "���������������������������������������������������",
                     WRITE_EXTERNAL_STORAGE, perms);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == 1) {
+            for (int i = 0; i < permissions.length; i++) {
+                if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
+                    //������������
+                    PermissionUtil.verifyStoragePermissions(this);
+                }
+            }
         }
     }
 
@@ -298,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);
             }
@@ -305,38 +337,39 @@
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
+            System.out.println("BleGattCallback onServiceDisconnected");
             mBluetoothService = null;
         }
-
-
     };
 
     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);
@@ -344,6 +377,7 @@
 
         @Override
         public void onDisConnected() {
+            System.out.println("MainActivity onDisConnected");
             progressDialog.dismiss();
             mToatUtils.showSingletonToast("���������������������");
             EventMessage msg = new EventMessage();
@@ -353,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