From 75eca4ac755a11728f5173bdc5dcc8c9a03b8744 Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期日, 25 六月 2023 18:30:46 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index fdff614..781bb8a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -21,6 +21,7 @@
 import com.hdl.photovoltaic.base.CustomBaseFragment;
 import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
 import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.other.HdlUniLogic;
 import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
@@ -114,11 +115,12 @@
 
     private void initData() {
         this.houseListBeanList = new ArrayList<>();
-        for (int i = 0; i < 11; i++) {
-            HouseListBean houseListBean = new HouseListBean();
-            houseListBean.setHomeName("鐢电珯" + i);
-            this.houseListBeanList.add(houseListBean);
-        }
+//        for (int i = 0; i < 11; i++) {
+//            HouseListBean houseListBean = new HouseListBean();
+//            houseListBean.setHomeName("鐢电珯" + i);
+//            this.houseListBeanList.add(houseListBean);
+//        }
+        this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList());
 
 
     }
@@ -148,6 +150,5 @@
         }
 
     }
-
 
 }

--
Gitblit v1.8.0