From 31e89a8697d049410c9d8d5c333cba33223bc9dc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 01 四月 2025 19:39:26 +0800
Subject: [PATCH] 2025年04月01日19:39:19

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 5 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 f8a14fd..4080f22 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -343,7 +343,7 @@
      *                             ascending:鍗囧簭),
      * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
      * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
-     * @param gridType             骞剁綉鐘舵�� (鍏ㄩ儴 锛�"";FULL_GRID 锛� 骞剁綉;OFFLINE 锛氱缃�)
+     * @param debugStatus          璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
      * @param powerStationStatus   鐢电珯鐘舵�� (鍏ㄩ儴  锛�"";1 锛� 姝e父;2 锛� 绂荤嚎; 3 锛� 寰呮帴鍏�;4 锛� 鏁呴殰)
      * @param pageNo               椤电爜
      * @param pageSize             椤垫暟锛堜竴椤靛灏戞暟鎹級
@@ -353,7 +353,7 @@
             String keyValue,
             String installedCapacityMin,
             String installedCapacityMax,
-            String gridType,
+            String debugStatus,
             String powerStationStatus,
             long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
 
@@ -376,9 +376,9 @@
             } catch (Exception ignored) {
             }
         }
-        if (!TextUtils.isEmpty(gridType)) {
+        if (!TextUtils.isEmpty(debugStatus)) {
             try {
-                json.addProperty("gridType", gridType);
+                json.addProperty("debugStatus", debugStatus);
             } catch (Exception ignored) {
             }
         }
@@ -573,10 +573,25 @@
 
     /**
      * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
+     *
+     * @param debugStatus          (璋冭瘯鐘舵��:Debugging = 璋冭瘯涓�,WAIT_DELIVERED = 璋冭瘯瀹屾垚,Delivered = 宸蹭氦浠�,SECONDARY_DEBUGGIN = 鎺堟潈璋冭瘯)
+     * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+     * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
      */
-    public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) {
+    public void getStatusOverview(String debugStatus, String installedCapacityMin, String installedCapacityMax, CloudCallBeak<StatusOverviewBean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_statusOverview;
         JsonObject json = new JsonObject();
+        if (!TextUtils.isEmpty(installedCapacityMin)) {
+            json.addProperty("installedCapacityMin", installedCapacityMin);
+        }
+        if (!TextUtils.isEmpty(installedCapacityMax)) {
+            json.addProperty("installedCapacityMin", installedCapacityMax);
+        }
+        if (!TextUtils.isEmpty(debugStatus)) {
+            json.addProperty("debugStatus", debugStatus);
+        }
+
+
 //        json.addProperty("zoneType", zoneType);//鍖哄煙
         HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
@@ -987,6 +1002,39 @@
 
     }
 
+
+    /**
+     * 鑾峰彇鐢电珯浜や粯URl锛圔绔級
+     * 鎻忚堪锛氬畨瑁呭晢鐢电珯鐨勪氦浠楿Rl
+     *
+     * @param homeId        鐢电珯id
+     * @param cloudCallBeak -
+     */
+    public void getDeliveryUrl(String homeId, CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_getDeliveryUrl;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+//        json.addProperty("zoneType", memberBean.getId());//鍖哄煙
+
+        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);
+                }
+            }
+        });
+
+    }
+
+
     /**
      * 鐢电珯鎵嬪姩浜や粯(B绔�)
      * 鎻忚堪锛氬畨瑁呭晢鎵嬪姩浜や粯鐢电珯缁欐寚瀹氱殑C绔处鍙�

--
Gitblit v1.8.0