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

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 cd29487..d367a11 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -20,7 +20,7 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 
-import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.hdl.photovoltaic.HDLApp;
@@ -28,6 +28,7 @@
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
+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;
@@ -39,6 +40,11 @@
 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 {
@@ -202,10 +208,11 @@
                         HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
                             @Override
                             public void onSuccess(LoginUserBean obj) {
-                                HdlResidenceLogic.getInstance().getHouseList(new CloudCallBeak<Boolean>() {
+                                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
                                     @Override
-                                    public void onSuccess(Boolean obj) {
+                                    public void onSuccess(List<HouseIdBean> obj) {
                                         hideLoading();
+                                        HdlResidenceLogic.getInstance().setHouseIdList(obj);
                                         restoreButtonStyleToInitializeState();
                                         startActivity(MyPowerStationActivity.class);
                                     }

--
Gitblit v1.8.0