From 329a536dc7ee9cb7bff1f59af9b54604b998c9ce Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 18 八月 2025 16:16:52 +0800
Subject: [PATCH] 2025年08月18日16:16:50

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 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 76837f2..ad21ee7 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)) {
@@ -499,6 +499,7 @@
 
     }
 
+
     /**
      * 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃
      *
@@ -509,10 +510,21 @@
      * @param deviceType_filter_value deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級锛�
      *                                type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱
      *                                timeType锛圱ODAY 锛氫粖澶╋紱LAST_3_DAYS: 杩�3澶╋紱LAST_7_DAYS 锛氳繎7澶╋紱LAST_30_DAYS 锛氳繎30澶╋級锛�
+     * @param search_title            鎶ヨ鍚嶇О
      * @param cloudCallBeak           -
      */
-    public void getPageNoMessageList(String homeId, int pageNo, String messageStateType, String deviceType_filter_key, String deviceType_filter_value, String type_filter_key, String type_filter_value, String timeType_filter_key, String timeType_filter_value, CloudCallBeak<MessageListClass> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Message_List;
+    public void getPageNoMessageList(
+            String homeId,
+            int pageNo,
+            String messageStateType,
+            String deviceType_filter_key,
+            String deviceType_filter_value,
+            String type_filter_key,
+            String type_filter_value,
+            String timeType_filter_key,
+            String timeType_filter_value,
+            String search_title, CloudCallBeak<MessageListClass> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_Message_Plan_List;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
             json.addProperty("homeId", homeId);
@@ -528,6 +540,9 @@
         }
         if (!TextUtils.isEmpty(timeType_filter_key) && !TextUtils.isEmpty(timeType_filter_value)) {
             json.addProperty(timeType_filter_key, timeType_filter_value);
+        }
+        if (!TextUtils.isEmpty(search_title)) {
+            json.addProperty("title", search_title);
         }
         json.addProperty("pageNo", pageNo);//椤电爜
         json.addProperty("pageSize", pageSize);//椤垫暟
@@ -567,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>() {
@@ -632,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);

--
Gitblit v1.8.0