From 4e59e31d1eff03798eabae43e3062be9fe61218c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 17:55:34 +0800
Subject: [PATCH] 2023年06月29日17:55:11

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 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..367716d 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,35 @@
 import android.widget.TextView;
 
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.constraintlayout.widget.ConstraintSet;
 
+import com.google.gson.Gson;
+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;
+import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.other.HdlFileLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
-import com.hdl.photovoltaic.ui.bean.LoginBean;
+import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+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.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.WifiUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
 
 
 public class HomeLoginActivity extends CustomBaseActivity {
@@ -79,7 +95,7 @@
     private void initView() {
         setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
         //娴嬭瘯鐢�
-        viewBinding.homeLoginAccountEt.setText("18402017839");
+        viewBinding.homeLoginAccountEt.setText("13375012441");
         viewBinding.homeLoginPasswordEt.setText("123456");
         isLoginTextViewEnabled();
     }
@@ -189,31 +205,26 @@
                 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) {
-                                HdlThreadLogic.runMainThread(new Runnable() {
+                            public void onSuccess(LoginUserBean obj) {
+                                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
                                     @Override
-                                    public void run() {
-                                        HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() {
-                                            @Override
-                                            public void onSuccess(Boolean obj) {
+                                    public void onSuccess(List<HouseIdBean> obj) {
+                                        hideLoading();
+                                        HdlResidenceLogic.getInstance().setHouseIdList(obj);
+                                        restoreButtonStyleToInitializeState();
+                                        startActivity(MyPowerStationActivity.class);
+                                    }
 
-                                            }
-
-                                            @Override
-                                            public void onFailure(Exception exception) {
-
-                                            }
-                                        });
+                                    @Override
+                                    public void onFailure(Exception exception) {
                                         hideLoading();
                                         restoreButtonStyleToInitializeState();
                                         startActivity(MyPowerStationActivity.class);
-
                                     }
-                                }, null, null);
-
+                                });
                             }
 
                             @Override
@@ -236,7 +247,9 @@
         viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(MyPowerStationActivity.class);
+//                requestPermissions();
+//                startActivity(MyPowerStationActivity.class);
+                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
             }
         });
 
@@ -286,10 +299,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);
     }
 
     /**
@@ -306,4 +324,5 @@
         view.setText(spannable);
     }
 
+
 }
\ No newline at end of file

--
Gitblit v1.8.0