From da8bb15e0d0293d373071b44b89f2b953ecc0830 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 27 六月 2023 11:00:37 +0800
Subject: [PATCH] 2023年06月27日11:00:19

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   82 ++++++++++++----------------------------
 1 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index adf4e9f..569a9a9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -20,6 +20,9 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -33,6 +36,7 @@
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.ui.device.FastScanActivity;
+import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.utils.PermissionUtils;
 import com.hdl.photovoltaic.utils.WifiUtils;
 
@@ -198,27 +202,21 @@
                         HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
                             @Override
                             public void onSuccess(LoginUserBean obj) {
-                                HdlThreadLogic.runMainThread(new Runnable() {
+                                HdlResidenceLogic.getInstance().getResidenceList(1,50,"","",new CloudCallBeak<Boolean>() {
                                     @Override
-                                    public void run() {
-                                        HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() {
-                                            @Override
-                                            public void onSuccess(Boolean obj) {
-                                                hideLoading();
-                                                restoreButtonStyleToInitializeState();
-                                                startActivity(MyPowerStationActivity.class);
-                                            }
-
-                                            @Override
-                                            public void onFailure(Exception exception) {
-                                                hideLoading();
-                                                restoreButtonStyleToInitializeState();
-                                                startActivity(MyPowerStationActivity.class);
-                                            }
-                                        });
+                                    public void onSuccess(Boolean obj) {
+                                        hideLoading();
+                                        restoreButtonStyleToInitializeState();
+                                        startActivity(MyPowerStationActivity.class);
                                     }
-                                }, null, null);
 
+                                    @Override
+                                    public void onFailure(Exception exception) {
+                                        hideLoading();
+                                        restoreButtonStyleToInitializeState();
+                                        startActivity(MyPowerStationActivity.class);
+                                    }
+                                });
                             }
 
                             @Override
@@ -243,12 +241,6 @@
             public void onClick(View v) {
 //                requestPermissions();
 //                startActivity(MyPowerStationActivity.class);
-                HdlThreadLogic.runMainThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        int s = 1 / 0;
-                    }
-                }, _mActivity, ShowErrorMode.YES);
             }
         });
 
@@ -298,10 +290,15 @@
      * 鎭㈠缁勪欢鏍峰紡鍒板垵濮嬪寲鐘舵��
      */
     private void restoreButtonStyleToInitializeState() {
-        viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
-        viewBinding.homeLoginAccountTextErrorTv.setText("");
-        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
-        viewBinding.homeLoginPasswordTextErrorTv.setText("");
+        HdlThreadLogic.runMainThread(new Runnable() {
+            @Override
+            public void run() {
+                viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+                viewBinding.homeLoginAccountTextErrorTv.setText("");
+                viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+                viewBinding.homeLoginPasswordTextErrorTv.setText("");
+            }
+        }, null, null);
     }
 
     /**
@@ -319,33 +316,4 @@
     }
 
 
-    private void requestPermissions() {
-        String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
-        if (ary.length > 0) {
-            requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
-        } else {
-            wifi();
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == PermissionUtils.STATUS_SUCCESS) {
-            for (int i = 0; i < permissions.length; i++) {
-                if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                    wifi();
-                }
-
-            }
-        }
-
-    }
-
-    public void wifi() {
-        WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
-//        wifiUtils.getCurrentConnectWifiInfo();
-//        wifiUtils.getScanResult();
-        wifiUtils.connectWiFi("Application", "12345678", 3);
-    }
 }
\ No newline at end of file

--
Gitblit v1.8.0