From 7fdae87bc3de46b5b012f8987c6902cd8b054323 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 16 五月 2024 18:17:11 +0800
Subject: [PATCH] 2024年05月16日18:17:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java |  105 ++++++++++++++++++++++++----------------------------
 1 files changed, 49 insertions(+), 56 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 c912953..0fa9abd 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
@@ -88,6 +88,9 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
+        //鏀惧湪杩欓噷涔熷锛岃繖閲屽彧鏄鍒涘缓涓�娆�
+//        loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+//        getStatusOverview();
         initData();
         //鍒濆鍖�
         initView();
@@ -494,8 +497,13 @@
             //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
             if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) {
                 HdlLogLogic.print("姝e湪鐐瑰嚮銆愮數绔欍��");
+//                HdlThreadLogic.runSubThread(new Runnable() {
+//                    @Override
+//                    public void run() {
                 loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                 getStatusOverview();
+//                    }
+//                });
 
             }
         }
@@ -541,15 +549,7 @@
      * @param pageNo               椤电爜
      * @param isClear              鏄惁娓呴櫎鏁版嵁
      */
-    private void loadNextPageHouseList(boolean isRefreshing,
-                                       String key,
-                                       String keyValue,
-                                       String installedCapacityMin,
-                                       String installedCapacityMax,
-                                       String gridType,
-                                       String powerStationStatus,
-                                       long pageNo,
-                                       boolean isClear) {
+    private void loadNextPageHouseList(boolean isRefreshing, String key, String keyValue, String installedCapacityMin, String installedCapacityMax, String gridType, String powerStationStatus, long pageNo, boolean isClear) {
         if (isClear) {
             clearData();
         }
@@ -565,57 +565,50 @@
         }
 
         //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
-        HdlResidenceLogic.getInstance().getResidenceIdList(
-                key,
-                keyValue,
-                installedCapacityMin,
-                installedCapacityMax,
-                gridType,
-                powerStationStatus,
-                pageNo, pageSize, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
+        HdlResidenceLogic.getInstance().getResidenceIdList(key, keyValue, installedCapacityMin, installedCapacityMax, gridType, powerStationStatus, pageNo, pageSize, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
+            @Override
+            public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
+                HdlThreadLogic.runMainThread(new Runnable() {
                     @Override
-                    public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
-                        HdlThreadLogic.runMainThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (isRefreshing) {
-                                    hideLoading();
-                                }
-                                isHouseLoadingMore = false;
-                                if (houseBeanClass != null) {
-                                    currentHouseListTotal = (int) houseBeanClass.getTotalPage();
-                                    currentHouseListPage = (int) houseBeanClass.getPageNo();
-                                    //鏇存柊缂撳瓨
-                                    HdlResidenceLogic.getInstance().setHouseIdList(houseBeanClass.getList());
-                                    if (houseInfoAdapter != null) {
-                                        initData();
-                                        //鏇存柊UI
-                                        houseInfoAdapter.setList(houseListBeanIDList);
-                                    }
-                                }
-                                nullDataUpdateUi();
+                    public void run() {
+                        if (isRefreshing) {
+                            hideLoading();
+                        }
+                        isHouseLoadingMore = false;
+                        if (houseBeanClass != null) {
+                            currentHouseListTotal = (int) houseBeanClass.getTotalPage();
+                            currentHouseListPage = (int) houseBeanClass.getPageNo();
+                            //鏇存柊缂撳瓨
+                            HdlResidenceLogic.getInstance().setHouseIdList(houseBeanClass.getList());
+                            if (houseInfoAdapter != null) {
+                                initData();
+                                //鏇存柊UI
+                                houseInfoAdapter.setList(houseListBeanIDList);
                             }
-                        }, _mActivity, ShowErrorMode.YES);
+                        }
+                        nullDataUpdateUi();
+                    }
+                }, _mActivity, ShowErrorMode.YES);
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                HdlThreadLogic.runMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (currentHouseListPage > 1) {
+                            --currentHouseListPage;
+                        }
+                        isHouseLoadingMore = false;
+                        if (isRefreshing) {
+                            hideLoading();
+                        }
 
                     }
-
-                    @Override
-                    public void onFailure(HDLException e) {
-                        HdlThreadLogic.runMainThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (currentHouseListPage > 1) {
-                                    --currentHouseListPage;
-                                }
-                                isHouseLoadingMore = false;
-                                if (isRefreshing) {
-                                    hideLoading();
-                                }
-
-                            }
-                        }, _mActivity, ShowErrorMode.YES);
-                    }
-                });
+                }, _mActivity, ShowErrorMode.YES);
+            }
+        });
     }
 
     /**

--
Gitblit v1.8.0