From e604e1797744977f599dad9f543db3e7477fe115 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 七月 2023 14:35:58 +0800
Subject: [PATCH] 2023年07月12日14:35:48

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |  196 ++++++++++++++++++++++++-------------------------
 1 files changed, 96 insertions(+), 100 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 674b46e..73e33cb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -1,9 +1,12 @@
 package com.hdl.photovoltaic.other;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.bean.HttpResponsePack;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
@@ -19,6 +22,7 @@
 import com.hdl.sdk.link.core.config.HDLLinkConfig;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -128,12 +132,12 @@
                             }
 
                             @Override
-                            public void onFailure(Exception exception) {
+                            public void onFailure(HDLException e) {
                                 atomicInteger.set(atomicInteger.get() + 1);
                                 if (atomicInteger.get() == houseIdList.size()) {
                                     //鏈�鍚庝竴鏉¢��鍑�
                                     if (cloudCallBeak != null) {
-                                        cloudCallBeak.onFailure(exception);
+                                        cloudCallBeak.onFailure(e);
                                     }
                                 }
                             }
@@ -148,9 +152,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -160,8 +164,11 @@
     /**
      * 鑾峰彇浣忓畢(鐢电珯)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) {
 
@@ -170,72 +177,66 @@
         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");//鍒涘缓鏃堕棿鎺掑簭
 //        json.addProperty("zoneType", "password");//鍖哄煙
         json.addProperty("pageNo", 1);//椤电爜
         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);
                     }
                 }
+                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(Exception exception) {
+            public void onFailure(HDLException exception) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onFailure(exception);
                 }
@@ -256,30 +257,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) {
-                try {
-                    if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                        Gson gson = new Gson();
-                        String jsonStr = gson.toJson(httpResponsePack.getData());
-                        HouseInfoBean houseInfoBean = gson.fromJson(jsonStr, HouseInfoBean.class);
-
-                        if (cloudCallBeak != null) {
-                            cloudCallBeak.onSuccess(houseInfoBean);
-                        }
-                    }
-                } catch (Exception exception) {
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onFailure(exception);
+                        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);
                 }
             }
         });
@@ -319,9 +315,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);
                 }
@@ -329,9 +325,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -348,9 +344,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);
                 }
@@ -358,9 +354,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -398,9 +394,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);
                 }
@@ -408,9 +404,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -421,28 +417,28 @@
     /**
      * 鑾峰彇浣忓畢鍥剧墖
      */
-    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);
                 }
             }
         });

--
Gitblit v1.8.0