From a3d9e72e6e4f7ad6778e89bc05f2fe656e36dab7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 28 四月 2025 14:51:55 +0800
Subject: [PATCH] 2025-04-28 14:51:52

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |  859 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 729 insertions(+), 130 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 fcdf6ec..afd5eaf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -1,24 +1,33 @@
 package com.hdl.photovoltaic.other;
 
+import android.graphics.Bitmap;
+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;
-import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.internet.api.HttpApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.ui.bean.ContactBean;
 import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
 import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
+import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * 浣忓畢閫昏緫鐣岄潰
+ * 浣忓畢閫昏緫
  */
 public class HdlResidenceLogic {
 
@@ -44,7 +53,7 @@
     }
 
     /**
-     * 鑾峰彇浣忓畢鍒楄〃
+     * 鑾峰彇缂撳瓨浣忓畢鍒楄〃
      *
      * @return 浣忓畢鍒楄〃
      */
@@ -59,30 +68,146 @@
         this.houseInfoList = houseInfoList;
     }
 
+    public void clearHouseList() {
+        if (mHouseIdList != null && mHouseIdList.size() > 0) {
+            mHouseIdList.clear();
+        }
+        if (houseInfoList != null && houseInfoList.size() > 0) {
+            houseInfoList.clear();
+        }
+    }
+
+
     /**
-     * 鑾峰彇浣忓畢ID鍒楄〃
+     * 鑾峰彇缂撳瓨浣忓畢ID鍒楄〃
      *
      * @return 浣忓畢ID鍒楄〃
      */
     public List<HouseIdBean> getHouseIdList() {
-        return houseIdList;
+        return mHouseIdList;
     }
 
-    public void setHouseIdList(List<HouseIdBean> houseIdList) {
-        if (houseIdList == null) {
-            houseIdList = new ArrayList<>();
+    /**
+     * 璁剧疆鍒楄〃鏁版嵁
+     *
+     * @param list    鏂板垪琛�
+     * @param isClear 鏄惁娓呴櫎鏃ф暟鎹�,true琛ㄧず娓呴櫎,鍚﹀垯涓嶆竻闄�;
+     */
+    public void setHouseIdList(List<HouseIdBean> list, boolean isClear) {
+        if (list == null || list.size() == 0) {
+            return;
         }
-        this.houseIdList = houseIdList;
+        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;
+        }
+        if (this.mHouseIdList.size() == 0) {
+            this.mHouseIdList.addAll(list);
+            return;
+        }
+        for (int i = 0; i < list.size(); i++) {
+            this.setSingleHouseId(list.get(i));
+        }
+    }
+
+    /**
+     * 娣诲姞鐢电珯Id鍒板垪琛ㄩ噷闈�
+     *
+     * @param houseIdBean -鐢电珯Id瀵硅薄
+     */
+    public void setSingleHouseId(HouseIdBean houseIdBean) {
+        try {
+            if (houseIdBean == null) {
+                return;
+            }
+            boolean if_boolean = false;
+            for (int i = 0; i < mHouseIdList.size(); i++) {
+                if (mHouseIdList.get(i).getHomeId().equals(houseIdBean.getHomeId())) {
+                    //瀛樺湪鏇挎崲
+                    mHouseIdList.remove(i);
+                    mHouseIdList.add(i, houseIdBean);
+                    if_boolean = true;
+                    break;
+                }
+            }
+            if (!if_boolean) {
+                //娌℃湁娣诲姞
+                this.mHouseIdList.add(houseIdBean);
+            }
+        } catch (Exception e) {
+            String mes = e.getMessage();
+            HdlLogLogic.print("--->" + mes);
+        }
+    }
+
+
+    /**
+     * 鍒犻櫎鐢电珯
+     *
+     * @param houseId 鐢电珯id
+     */
+    public void delHouseId(String houseId) {
+        if (TextUtils.isEmpty(houseId)) {
+            return;
+        }
+        for (int i = 0; i < mHouseIdList.size(); i++) {
+            if (mHouseIdList.get(i).getHomeId().equals(houseId)) {
+                mHouseIdList.remove(i);
+                break;
+            }
+        }
+    }
+
+    /**
+     * 绉诲姩鐢电珯浣嶇疆
+     *
+     * @param houseId 鐢电珯id
+     */
+    public void moveHouseId(String houseId) {
+        if (TextUtils.isEmpty(houseId)) {
+            return;
+        }
+        int index = -1;
+        for (int i = 0; i < mHouseIdList.size(); i++) {
+            if (mHouseIdList.get(i).getHomeId().equals(houseId)) {
+                index = i;
+                break;
+            }
+        }
+        if (index == -1) {
+            return;
+        }
+        //index==0琛ㄧず鍙湁涓�涓厓绱犳垨鑰呭湪棣栦綅,涓嶉渶瑕佺Щ鍔ㄤ綅缃�
+        if (index > 0) {
+            Collections.swap(mHouseIdList, index - 1, index);
+        }
     }
 
     //浣忓畢ID鍒楄〃
-    private List<HouseIdBean> houseIdList = new ArrayList<>();
+    private List<HouseIdBean> mHouseIdList = new ArrayList<>();
     //浣忓畢璇︽儏鍒楄〃
     private List<HouseInfoBean> houseInfoList = new ArrayList<>();
 
 
     /**
-     * 鑾峰彇浣忓畢鍒楄〃
+     * 鑾峰彇浣忓畢鍒楄〃锛屽寘鎷幏鍙栦綇瀹卛d鍒楄〃锛屼綇瀹呰鎯呭垪琛紱
      *
      * @param cloudCallBeak -
      */
@@ -92,19 +217,19 @@
             @Override
             public void onSuccess(List<HouseIdBean> houseListBeanIDList) {
                 if (houseListBeanIDList != null && houseListBeanIDList.size() > 0) {
-                    houseIdList.clear();
-                    houseIdList.addAll(houseListBeanIDList);
+                    mHouseIdList.clear();
+                    mHouseIdList.addAll(houseListBeanIDList);
                     //璁板綍璇锋眰鏉℃暟
                     AtomicInteger atomicInteger = new AtomicInteger(0);
-                    for (int i = 0; i < houseIdList.size(); i++) {
-                        HouseIdBean houseIdBean = houseIdList.get(i);
+                    for (int i = 0; i < mHouseIdList.size(); i++) {
+                        HouseIdBean houseIdBean = mHouseIdList.get(i);
                         //鑾峰彇浣忓畢璇︽儏鍒楄〃
                         getResidenceInfo(houseIdBean.getHomeId(), new CloudCallBeak<HouseInfoBean>() {
                             @Override
                             public void onSuccess(HouseInfoBean houseInfoBean) {
                                 atomicInteger.set(atomicInteger.get() + 1);
                                 if (houseInfoBean != null) {
-                                    houseInfoBean.setHomeImage(houseIdBean.getHomeImage());//鐢电珯鍥剧墖
+                                    houseInfoBean.setPowerStationImage(houseIdBean.getPowerStationImage());//鐢电珯鍥剧墖
                                     houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//瑁呮満瀹归噺
                                     houseInfoBean.setPower(houseIdBean.getPower());//鍙戠數鍔熺巼
                                     houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//浠婂ぉ鍙戠數閲�
@@ -112,7 +237,7 @@
                                     //娣诲姞鍒版湰鍦扮紦瀛�
                                     addHouseToLocalMemory(houseInfoBean);
                                 }
-                                if (atomicInteger.get() == houseIdList.size()) {
+                                if (atomicInteger.get() == mHouseIdList.size()) {
                                     //鏈�鍚庝竴鏉¢��鍑�
                                     if (cloudCallBeak != null) {
                                         cloudCallBeak.onSuccess(true);
@@ -122,12 +247,12 @@
                             }
 
                             @Override
-                            public void onFailure(Exception exception) {
+                            public void onFailure(HDLException e) {
                                 atomicInteger.set(atomicInteger.get() + 1);
-                                if (atomicInteger.get() == houseIdList.size()) {
+                                if (atomicInteger.get() == mHouseIdList.size()) {
                                     //鏈�鍚庝竴鏉¢��鍑�
                                     if (cloudCallBeak != null) {
-                                        cloudCallBeak.onFailure(exception);
+                                        cloudCallBeak.onFailure(e);
                                     }
                                 }
                             }
@@ -142,9 +267,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -154,82 +279,158 @@
     /**
      * 鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
      *
-     * @param key      鍙戠數鍔熺巼鎺掑簭(powerSort);浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
-     * @param keyValue (descending:闄嶅簭ascending:鍗囧簭),
+     * @param key      鍙戠數鍔熺巼鎺掑簭(powerSort);
+     *                 浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);
+     *                 鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
+     * @param keyValue (descending:闄嶅簭
+     *                 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)) {
+            json.addProperty(key, keyValue);//鍙戠數鍔熺巼鎺掑簭(descending:闄嶅簭ascending:鍗囧簭)
+        }
+//        json.addProperty("zoneType", "password");//鍖哄煙
+        json.addProperty("pageNo", 1);//椤电爜
+        json.addProperty("pageSize", pageSize);//椤垫暟
+        List<HouseIdBean> list = new ArrayList<>();
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(list);
+                    }
+                }
+                Gson gson = new Gson();
+                HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
+                list.addAll(houseInfoBeanClass.getList());
+                //鎬诲叡鏈夊灏戦〉
+                long totalPage = houseInfoBeanClass.totalPage;
+                if (totalPage < 2) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(list);
+                    }
+                    return;
+                }
+                //璁板綍璇锋眰鏉℃暟
+                AtomicInteger atomicInteger = new AtomicInteger(0);
+                //浠庣浜岄〉鑾峰彇鏁版嵁
+                for (int i = 2; i <= totalPage; i++) {
+                    json.addProperty("pageNo", i);//鏇存柊椤电爜
+                    HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+                        @Override
+                        public void onSuccess(String jsonStr) {
+                            atomicInteger.set(atomicInteger.get() + 1);
+                            Gson gson = new Gson();
+                            HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
+                            list.addAll(houseInfoBeanClass.getList());
+                            if (atomicInteger.get() == totalPage - 1) {
+                                //鏈�鍚庝竴鏉¢��鍑�
+                                if (cloudCallBeak != null) {
+                                    cloudCallBeak.onSuccess(list);
+                                }
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+                            atomicInteger.set(atomicInteger.get() + 1);
+                            if (atomicInteger.get() == totalPage - 1) {
+                                //鏈�鍚庝竴鏉¢��鍑�
+                                if (cloudCallBeak != null) {
+                                    cloudCallBeak.onSuccess(list);
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException exception) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(exception);
+                }
+            }
+        });
+
+
+    }
+
+    /**
+     * 鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
+     *
+     * @param key                  鍙戠數鍔熺巼鎺掑簭(powerSort);
+     *                             浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);
+     *                             鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
+     * @param keyValue             (descending:闄嶅簭
+     *                             ascending:鍗囧簭),
+     * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+     * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+     * @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 debugStatus, String powerStationStatus, long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
 
         String requestUrl = HttpApi.POST_PowerStation_List;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(keyValue)) {
             json.addProperty(key, keyValue);//鍙戠數鍔熺巼鎺掑簭(descending:闄嶅簭ascending:鍗囧簭)
         }
-//        json.addProperty("powerSort", "descending");//鍙戠數鍔熺巼鎺掑簭(descending:闄嶅簭ascending:鍗囧簭)
-//        json.addProperty("todayElectricitySort", "descending");//浠婃棩鍙戠數閲忔帓搴�
-//        json.addProperty("createTimeSort", "descending");//鍒涘缓鏃堕棿鎺掑簭
+        if (!TextUtils.isEmpty(installedCapacityMin)) {
+            try {
+                int value = Integer.parseInt(installedCapacityMin);//鍙兘鏈夊紓甯�,鐢ㄦ埛杈撳叆鍊艰秴鏃秈nt鏈�澶ц嚧瀵艰嚧鐨�
+                json.addProperty("installedCapacityMin", value);
+            } catch (Exception ignored) {
+            }
+        }
+        if (!TextUtils.isEmpty(installedCapacityMax)) {
+            try {
+                int value = Integer.parseInt(installedCapacityMax);//鍙兘鏈夊紓甯�,鐢ㄦ埛杈撳叆鍊艰秴鏃秈nt鏈�澶ц嚧瀵艰嚧鐨�
+                json.addProperty("installedCapacityMax", value);
+            } catch (Exception ignored) {
+            }
+        }
+        if (!TextUtils.isEmpty(debugStatus)) {
+            try {
+                json.addProperty("debugStatus", debugStatus);
+            } catch (Exception ignored) {
+            }
+        }
+        if (!TextUtils.isEmpty(powerStationStatus)) {
+            try {
+                int value = Integer.parseInt(powerStationStatus);
+                json.addProperty("powerStationStatus", value);
+            } catch (Exception ignored) {
+            }
+        }
 //        json.addProperty("zoneType", "password");//鍖哄煙
-        json.addProperty("pageNo", 1);//椤电爜
+        json.addProperty("pageNo", pageNo);//椤电爜
         json.addProperty("pageSize", pageSize);//椤垫暟
-        List<HouseIdBean> list = new ArrayList<>();
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                    Gson gson = new Gson();
-                    String jsonStr = gson.toJson(httpResponsePack.getData());
-                    HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
-                    list.addAll(houseInfoBeanClass.getList());
-                    //鎬诲叡鏈夊灏戦〉
-                    long totalPage = houseInfoBeanClass.totalPage;
-                    if (totalPage < 2) {
-                        if (cloudCallBeak != null) {
-                            cloudCallBeak.onSuccess(list);
-                        }
-                        return;
-                    }
-                    //璁板綍璇锋眰鏉℃暟
-                    AtomicInteger atomicInteger = new AtomicInteger(0);
-                    //浠庣浜岄〉鑾峰彇鏁版嵁
-                    for (int i = 2; i <= totalPage; i++) {
-                        json.addProperty("pageNo", i);//鏇存柊椤电爜
-                        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
-                            @Override
-                            public void onSuccess(HttpResponsePack httpResponsePack) {
-                                atomicInteger.set(atomicInteger.get() + 1);
-                                Gson gson = new Gson();
-                                String jsonStr = gson.toJson(httpResponsePack.getData());
-                                HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
-                                list.addAll(houseInfoBeanClass.getList());
-                                if (atomicInteger.get() == totalPage - 1) {
-                                    //鏈�鍚庝竴鏉¢��鍑�
-                                    if (cloudCallBeak != null) {
-                                        cloudCallBeak.onSuccess(list);
-                                    }
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Exception exception) {
-                                atomicInteger.set(atomicInteger.get() + 1);
-                                if (atomicInteger.get() == totalPage - 1) {
-                                    //鏈�鍚庝竴鏉¢��鍑�
-                                    if (cloudCallBeak != null) {
-                                        cloudCallBeak.onSuccess(list);
-                                    }
-                                }
-                            }
-                        });
-                    }
-
-                } else {
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onSuccess(list);
+                        cloudCallBeak.onSuccess(new HouseBeanClass());
                     }
+                    return;
                 }
+                Gson gson = new Gson();
+                HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(houseInfoBeanClass);
+                }
+
+
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException exception) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onFailure(exception);
                 }
@@ -250,24 +451,25 @@
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);//鐢电珯id
         //json.addProperty("zoneType", "password");//鍖哄煙
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                    Gson gson = new Gson();
-                    String jsonStr = gson.toJson(httpResponsePack.getData());
-                    HouseInfoBean houseInfoBean = gson.fromJson(jsonStr, HouseInfoBean.class);
-
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onSuccess(houseInfoBean);
+                        cloudCallBeak.onSuccess(null);
                     }
+                }
+                Gson gson = new Gson();
+                HouseInfoBean houseInfoBean = gson.fromJson(jsonStr, HouseInfoBean.class);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(houseInfoBean);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -307,9 +509,9 @@
         json.addProperty("electrovalence", houseInfoBean.getElectrovalence());
         json.addProperty("totalCost", houseInfoBean.getTotalCost());
         json.addProperty("zoneType", houseInfoBean.getZoneType());
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
                 }
@@ -317,9 +519,42 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+    }
+
+    /**
+     * 浣忓畢(鐢电珯)绉诲姩浣嶇疆
+     *
+     * @param homeId        鐢电珯id
+     * @param frontHomeId   鍓嶉潰鐨勭數绔檌d锛屽鏋滀笉浼犺〃绀烘帓鍒扮涓�浣�
+     * @param cloudCallBeak -
+     */
+    public void moveResidence(String homeId, String frontHomeId, CloudCallBeak<Boolean> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_PowerStation_UserSort;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+        if (!TextUtils.isEmpty(frontHomeId)) {
+            json.addProperty("frontHomeId", frontHomeId);
+        }
+//        json.addProperty("zoneType", "zoneType");
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String str) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(true);
+                }
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -336,9 +571,9 @@
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);//鐢电珯id
         //json.addProperty("zoneType", "password");//鍖哄煙
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
                 }
@@ -346,13 +581,59 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
 
+    }
+
+    /**
+     * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
+     *
+     * @param debugStatus          (璋冭瘯鐘舵��:Debugging = 璋冭瘯涓�,WAIT_DELIVERED = 璋冭瘯瀹屾垚,Delivered = 宸蹭氦浠�,SECONDARY_DEBUGGIN = 鎺堟潈璋冭瘯)
+     * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+     * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+     */
+    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("installedCapacityMax", installedCapacityMax);
+        }
+        if (!TextUtils.isEmpty(debugStatus)) {
+            json.addProperty("debugStatus", debugStatus);
+        }
+
+
+//        json.addProperty("zoneType", zoneType);//鍖哄煙
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(new StatusOverviewBean());
+                    }
+                }
+                Gson gson = new Gson();
+                StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(statusOverviewBean);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
     }
 
     /**
@@ -386,9 +667,9 @@
         json.addProperty("electrovalence", houseInfoBean.getElectrovalence());
         json.addProperty("totalCost", houseInfoBean.getTotalCost());
         json.addProperty("zoneType", houseInfoBean.getZoneType());
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
                 }
@@ -396,9 +677,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -409,28 +690,123 @@
     /**
      * 鑾峰彇浣忓畢鍥剧墖
      */
-    public void getResidenceImage(String imageUrl, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
+    public void getResidenceImage(String imageUrl, CloudCallBeak<Bitmap> cloudCallBeak) {
         String requestUrl = imageUrl;
         JsonObject json = new JsonObject();
-        List<HouseIdBean> list = new ArrayList<>();
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                    Gson gson = new Gson();
-                    String jsonStr = gson.toJson(httpResponsePack.getData());
-                    HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
-                } else {
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onSuccess(list);
+                        cloudCallBeak.onSuccess(null);
                     }
+                    return;
+                }
+                Bitmap bitmap = BitmapFactory.decodeByteArray(jsonStr.getBytes(), 0, jsonStr.getBytes().length);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(bitmap);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+
+    /**
+     * 鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣�
+     *
+     * @param tempType      娓╁害鍗曚綅绫诲瀷 (C 锛氭憚姘忓害锛� F 锛氬崕姘忓害)
+     * @param cloudCallBeak -
+     */
+    public void setResidenceTemperatureUnit(String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_C_F_CustomConfig;
+        JsonObject json = new JsonObject();
+        json.addProperty("tempType", tempType);
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String str) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(true);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+
+    /**
+     * 鑱旂郴鎴戜滑
+     *
+     * @param cloudCallBeak -
+     */
+    public void getResidenceUtilContact(CloudCallBeak<ContactBean> cloudCallBeak) {
+        String requestUrl = HttpApi.B_POST_GET_UTIL_CONTACT;
+        JsonObject json = new JsonObject();
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(new ContactBean());
+                        return;
+                    }
+                }
+                ContactBean contactBean = new Gson().fromJson(jsonStr, ContactBean.class);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(contactBean);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�
+     *
+     * @param cloudCallBeak -
+     */
+    public void getResidenceTemperatureUnit(CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_C_F_CustomConfigInfo;
+        JsonObject json = new JsonObject();
+//        json.addProperty("homeId", homeId);
+
+        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);
                 }
             }
         });
@@ -500,27 +876,250 @@
     }
 
     /**
-     * 鍒囨崲浣忓畢
+     * 鑾峰彇浣忓畢Id瀵硅薄
      *
      * @param homeId 浣忓畢id
+     * @return 鍒楄〃绱㈠紩
      */
-    public Boolean switchHouse(String homeId) {
-        String oidHomeId = UserConfigManage.getInstance().getHomeId();
-        HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
-        UserConfigManage.getInstance().setHomeId(homeId);
-        HdlFileLogic.getInstance().createDirectory();
-
-        HdlThreadLogic.runThread(new Runnable() {
-            @Override
-            public void run() {
-                //鎼滅储涓�涓嬩綇瀹呰澶�
+    public HouseIdBean getHouseId(String homeId) {
+        for (int i = 0; i < mHouseIdList.size(); i++) {
+            if (mHouseIdList.get(i).getHomeId().equals(homeId)) {
+                return mHouseIdList.get(i);
             }
-        }, null, null);
-        return true;
+        }
+        return null;
+    }
+
+    /**
+     * 鍒囨崲浣忓畢
+     *
+     * @param houseIdBean    浣忓畢Id瀵硅薄
+     * @param checkStationId 琛ㄧず鏄惁鍚姩妫�楠岀數绔橧d鐨勯�昏緫锛坱rue琛ㄧず妫�娴�,鍚﹀垯涓嶆楠岋級
+     */
+    public void switchHouse(HouseIdBean houseIdBean, boolean checkStationId) {
+        String homeId = UserConfigManage.getInstance().getHomeId();
+        if (checkStationId) {
+            if (houseIdBean.getHomeId().equals(homeId)) {
+                HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�--->" + homeId);
+                return;
+            }
+        }
+        //璁㈤槄瑕佸叏閮ㄥ彇娑�
+        if (MqttRecvClient.getInstance() != null) {
+            MqttRecvClient.getInstance().removeAllTopic();
+        }
+        //瑕佹竻绌轰箣鍓峵cp杩炴帴缂撳瓨
+        //TODO: 10/10/23
+        //鍒犻櫎鏃х殑浣忓畢鏂囦欢澶� 2023骞�11鏈�03鏃�14:28:19鏆傛椂鍘绘帀
+//        HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
+        //閲嶆柊璁剧疆浣忓畢id
+        UserConfigManage.getInstance().setHomeId(houseIdBean.getHomeId());
+        UserConfigManage.getInstance().setHomeName(houseIdBean.getHomeName());
+        //閲嶆柊璁剧疆鏈湴閫氳绉橀挜
+        UserConfigManage.getInstance().setLocalSecret(houseIdBean.getLocalSecret());
+        UserConfigManage.getInstance().Save();
+        //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+        HDLLinkConfig.getInstance().setHomeId(UserConfigManage.getInstance().getHomeId());
+        HDLLinkConfig.getInstance().setLocalSecret(UserConfigManage.getInstance().getLocalSecret());
+        //閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
+        HdlFileLogic.getInstance().createDirectory();
+        //杩涘幓浣忓畢璇︽儏鎼滅储涓�涓嬮�嗗彉鍣ㄥ垪琛�,鐩殑鏄缓绔嬮�氳閫氶亾;
+        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(), null);
     }
 
 
-    static class HouseBeanClass {
+    /**
+     * 鐢电珯鏁版嵁(缁熻)
+     *
+     * @param homeId 浣忓畢id
+     */
+    public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_inverter_allInfo;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+        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);
+                }
+            }
+        });
+    }
+
+    /**
+     * 鐢电珯鎺堟潈瀹夎鍟嗭紙C绔級
+     * 鎻忚堪锛氫氦浠樺悗鐨勪綇瀹咃紝C绔敤鎴峰彲浠ュ紑鍚巿鏉冨悗瀹夎鍟嗗彲浠ョ户缁皟璇曠數绔�
+     *
+     * @param homeId        鐢电珯id
+     * @param debugPerm     鎺堟潈鐘舵�侊紙true鍙互缁х画璋冭瘯锛�
+     * @param 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);
+        json.addProperty("debugPerm", debugPerm);
+//        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(true);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇鐢电珯浜や粯浜岀淮鐮侊紙B绔級
+     * 鎻忚堪锛氬畨瑁呭晢鐢电珯鐨勪氦浠樹簩缁寸爜
+     *
+     * @param homeId        鐢电珯id
+     * @param cloudCallBeak -
+     */
+    public void getDeliveryUrlQrcode(String homeId, CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_getDeliveryUrlQrcode;
+        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);
+                }
+            }
+        });
+
+    }
+
+
+    /**
+     * 鑾峰彇鐢电珯浜や粯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绔处鍙�
+     *
+     * @param homeId        鐢电珯id
+     * @param account       C绔处鍙�
+     * @param cloudCallBeak -
+     */
+    public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_deliverToAccount;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+        json.addProperty("account", account);//C绔处鍙�
+//        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(true);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 娣诲姞鎺ㄩ�乀oken
+     *
+     * @param cloudCallBeak -
+     */
+    public void pushAdd(CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_push_add;
+        JsonObject json = new JsonObject();
+        json.addProperty("deviceName", Build.MODEL);//璁惧鍚嶇О
+        json.addProperty("deviceType", "Android");//璁惧绫诲瀷
+        json.addProperty("produce", AppConfigManage.isIsOnlineServer());//琛ㄧず鏄惁鏄寮忔湇鍔″櫒
+        json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
+        json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮
+
+        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 {
 
         //鎬绘潯鏁�
         private long totalCount;

--
Gitblit v1.8.0