From e62bcdaa38f0f00e25610b1a6c6ba847d65640ff Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 26 六月 2023 15:44:15 +0800
Subject: [PATCH] 2023年06月26日15:44:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   72 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 15 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 1d03953..adf4e9f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -1,7 +1,8 @@
 package com.hdl.photovoltaic.ui;
 
 
-import android.app.Activity;
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.Spannable;
@@ -16,20 +17,24 @@
 import android.widget.TextView;
 
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.constraintlayout.widget.ConstraintSet;
 
+import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
-import com.hdl.photovoltaic.ui.bean.LoginBean;
+import com.hdl.photovoltaic.ui.bean.LoginUserBean;
 import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
+import com.hdl.photovoltaic.ui.device.FastScanActivity;
+import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.WifiUtils;
 
 
 public class HomeLoginActivity extends CustomBaseActivity {
@@ -79,7 +84,7 @@
     private void initView() {
         setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
         //娴嬭瘯鐢�
-        viewBinding.homeLoginAccountEt.setText("18402017839");
+        viewBinding.homeLoginAccountEt.setText("13375012441");
         viewBinding.homeLoginPasswordEt.setText("123456");
         isLoginTextViewEnabled();
     }
@@ -189,28 +194,28 @@
                 HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() {
                     @Override
                     public void onSuccess(LoginUserRegionBean obj) {
-                        AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
-                        HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginBean>() {
+                        AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
+                        HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
                             @Override
-                            public void onSuccess(LoginBean obj) {
+                            public void onSuccess(LoginUserBean obj) {
                                 HdlThreadLogic.runMainThread(new Runnable() {
                                     @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);
                                             }
                                         });
-                                        hideLoading();
-                                        restoreButtonStyleToInitializeState();
-                                        startActivity(MyPowerStationActivity.class);
-
                                     }
                                 }, null, null);
 
@@ -236,7 +241,14 @@
         viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(MyPowerStationActivity.class);
+//                requestPermissions();
+//                startActivity(MyPowerStationActivity.class);
+                HdlThreadLogic.runMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        int s = 1 / 0;
+                    }
+                }, _mActivity, ShowErrorMode.YES);
             }
         });
 
@@ -306,4 +318,34 @@
         view.setText(spannable);
     }
 
+
+    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