From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 67f887a..4112b49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -4,6 +4,7 @@
 import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -86,6 +87,33 @@
         return mHouseIdList;
     }
 
+    /**
+     * 璁剧疆鍒楄〃鏁版嵁
+     *
+     * @param list    鏂板垪琛�
+     * @param isClear 鏄惁娓呴櫎鏃ф暟鎹�,true琛ㄧず娓呴櫎,鍚﹀垯涓嶆竻闄�;
+     */
+    public void setHouseIdList(List<HouseIdBean> list, boolean isClear) {
+        if (list == null || list.size() == 0) {
+            return;
+        }
+        if (isClear) {
+            this.clearHouseList();
+        }
+        if (this.mHouseIdList.size() == 0) {
+            this.mHouseIdList.addAll(list);
+            return;
+        }
+        for (int i = 0; i < list.size(); i++) {
+            this.setSingleHouseId(list.get(i));
+        }
+    }
+
+    /**
+     * 璁剧疆鍒楄〃鏁版嵁
+     *
+     * @param list 鏂板垪琛ㄦ暟鎹�
+     */
     public void setHouseIdList(List<HouseIdBean> list) {
         if (list == null || list.size() == 0) {
             return;
@@ -258,7 +286,6 @@
      *                 ascending:鍗囧簭),
      */
     public void getResidenceIdList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
-
         String requestUrl = HttpApi.POST_PowerStation_List;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(keyValue)) {
@@ -319,7 +346,6 @@
                         }
                     });
                 }
-
             }
 
             @Override
@@ -343,19 +369,12 @@
      *                             ascending:鍗囧簭),
      * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
      * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
-     * @param gridType             骞剁綉鐘舵�� (鍏ㄩ儴 锛�"";FULL_GRID 锛� 骞剁綉;OFFLINE 锛氱缃�)
+     * @param debugStatus          璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
      * @param powerStationStatus   鐢电珯鐘舵�� (鍏ㄩ儴  锛�"";1 锛� 姝e父;2 锛� 绂荤嚎; 3 锛� 寰呮帴鍏�;4 锛� 鏁呴殰)
      * @param pageNo               椤电爜
      * @param pageSize             椤垫暟锛堜竴椤靛灏戞暟鎹級
      */
-    public void getResidenceIdList(
-            String key,
-            String keyValue,
-            String installedCapacityMin,
-            String installedCapacityMax,
-            String gridType,
-            String powerStationStatus,
-            long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
+    public void getResidenceIdList(String key, String keyValue, String installedCapacityMin, String installedCapacityMax, String debugStatus, String powerStationStatus, long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
 
         String requestUrl = HttpApi.POST_PowerStation_List;
         JsonObject json = new JsonObject();
@@ -376,9 +395,9 @@
             } catch (Exception ignored) {
             }
         }
-        if (!TextUtils.isEmpty(gridType)) {
+        if (!TextUtils.isEmpty(debugStatus)) {
             try {
-                json.addProperty("gridType", gridType);
+                json.addProperty("debugStatus", debugStatus);
             } catch (Exception ignored) {
             }
         }
@@ -899,8 +918,7 @@
      *
      * @param homeId 浣忓畢id
      */
-    public void getResidenceInverterAllInfo(String
-                                                    homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
+    public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
         String requestUrl = HttpApi.POST_inverter_allInfo;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);
@@ -930,8 +948,7 @@
      * @param debugPerm     鎺堟潈鐘舵�侊紙true鍙互缁х画璋冭瘯锛�
      * @param cloudCallBeak -
      */
-    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<
-            Boolean> cloudCallBeak) {
+    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);
@@ -1028,8 +1045,7 @@
      * @param account       C绔处鍙�
      * @param cloudCallBeak -
      */
-    public void getDeliverToAccount(String homeId, String
-            account, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_deliverToAccount;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);

--
Gitblit v1.8.0