From c6d45e6d3c91db5c0295892c8c2ed04d43356c14 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 十一月 2025 15:10:12 +0800
Subject: [PATCH] 2025年11月19日15:09:29 完成B端消息功能

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java |  100 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
index 25163ba..c63c146 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -24,7 +24,7 @@
 public class HdlMessageLogic {
     private static volatile HdlMessageLogic sHdlMessageLogic;
 
-    private final int pageSize = 50;//椤垫暟
+    private final int pageSize = 100;//椤垫暟
     private List<MessageBean> mListMessage = new ArrayList<>();
 
 
@@ -224,7 +224,7 @@
             }
         } catch (Exception e) {
             String mes = e.getMessage();
-            HdlLogLogic.print("--->" + mes);
+            HdlLogLogic.print("---" + mes);
         }
     }
 
@@ -255,7 +255,7 @@
             }
         } catch (Exception e) {
             String mes = e.getMessage();
-            HdlLogLogic.print("--->" + mes);
+            HdlLogLogic.print("---" + mes);
         }
     }
 
@@ -311,7 +311,7 @@
      * @param cloudCallBeak -
      */
     public void getMessageUntreatedCount(String homeId, CloudCallBeak<UnCountBean> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_UntreatedCount;
+        String requestUrl = HttpApi.POST_Message_Plan_UntreatedCount;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
             json.addProperty("homeId", homeId);
@@ -378,7 +378,7 @@
      * @param cloudCallBeak    -
      */
     private void getMessageList(String messageStateType, CloudCallBeak<List<MessageBean>> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_List;
+        String requestUrl = HttpApi.POST_Message_Plan_List;
         JsonObject json = new JsonObject();
 
         if (!MessageStateType.all.equals(messageStateType)) {
@@ -462,7 +462,7 @@
      * @param cloudCallBeak    -
      */
     public void getPageNoMessageList(int pageNo, String messageStateType, CloudCallBeak<MessageListClass> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_List;
+        String requestUrl = HttpApi.POST_Message_Plan_List;
         JsonObject json = new JsonObject();
 
         if (!MessageStateType.all.equals(messageStateType)) {
@@ -524,7 +524,7 @@
             String timeType_filter_key,
             String timeType_filter_value,
             String search_title, CloudCallBeak<MessageListClass> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_List;
+        String requestUrl = HttpApi.POST_Message_Plan_List;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
             json.addProperty("homeId", homeId);
@@ -582,7 +582,7 @@
      * @param cloudCallBeak -
      */
     public void getMessageInfo(String msgId, CloudCallBeak<MessageBean> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_Info;
+        String requestUrl = HttpApi.POST_Message_Plan_Info;
         JsonObject json = new JsonObject();
         json.addProperty("msgId", msgId);
         HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -647,7 +647,7 @@
      * @param cloudCallBeak -
      */
     public void messageAllRead(String homeId, CloudCallBeak<Boolean> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_AllRead;
+        String requestUrl = HttpApi.POST_Message_Plan_AllRead;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
             json.addProperty("homeId", homeId);
@@ -672,6 +672,88 @@
     }
 
 
+    /**
+     * 鑾峰彇娑堟伅浣忓畢鍒楄〃
+     *
+     * @param homeName      鐢电珯鍚嶇О锛堟悳绱㈢敤鐨勶級,濡傛灉鏄┖瀛楃涓查粯璁よ鍙栧叏閮�
+     * @param cloudCallBeak -
+     */
+    public void getMessageHouseList(String homeName, CloudCallBeak<List<MessageBean>> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_Message_Plan_homeListByPage;
+        JsonObject json = new JsonObject();
+
+        if (!TextUtils.isEmpty(homeName)) {
+            json.addProperty("homeName", homeName);
+        }
+        json.addProperty("pageNo", 1);//椤电爜
+        json.addProperty("pageSize", 500);//椤垫暟
+
+        final List<MessageBean> 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(new ArrayList<>());
+                    }
+                    return;
+                }
+                Gson gson = new Gson();
+                MessageListClass oldMessageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+                list.addAll(oldMessageListClass.getList());
+                //鎬诲叡鏈夊灏戦〉
+                long totalPage = oldMessageListClass.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);
+                            MessageListClass newMessageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+                            list.addAll(newMessageListClass.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 e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+
     public static class MessageListClass {
 
         //鎬绘潯鏁�

--
Gitblit v1.8.0