From e0a5ebeb7ab4480a89cc22bc1093cea71046edd7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 七月 2025 15:22:43 +0800
Subject: [PATCH] 2025年07月14日14:57:30

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |   81 ++++++++++++++++++++++++++++++++--------
 1 files changed, 64 insertions(+), 17 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 4080f22..0c7bf1d 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
@@ -348,14 +374,7 @@
      * @param pageNo               椤电爜
      * @param pageSize             椤垫暟锛堜竴椤靛灏戞暟鎹級
      */
-    public void getResidenceIdList(
-            String key,
-            String keyValue,
-            String installedCapacityMin,
-            String installedCapacityMax,
-            String debugStatus,
-            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();
@@ -585,7 +604,7 @@
             json.addProperty("installedCapacityMin", installedCapacityMin);
         }
         if (!TextUtils.isEmpty(installedCapacityMax)) {
-            json.addProperty("installedCapacityMin", installedCapacityMax);
+            json.addProperty("installedCapacityMax", installedCapacityMax);
         }
         if (!TextUtils.isEmpty(debugStatus)) {
             json.addProperty("debugStatus", debugStatus);
@@ -914,8 +933,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);
@@ -945,8 +963,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);
@@ -1043,8 +1060,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);
@@ -1103,6 +1119,37 @@
 
     }
 
+    /**
+     * 鍒犻櫎鎺ㄩ�乀oken
+     *
+     * @param cloudCallBeak -
+     */
+    public void pushDel(CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_push_del;
+        JsonObject json = new JsonObject();
+        json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
+        json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());
+
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(jsonStr);
+                }
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
     public static class HouseBeanClass {
 
         //鎬绘潯鏁�

--
Gitblit v1.8.0