From 5d3efa4c93dde0cde474951e5310bb72ebbf4184 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:18:26 +0800
Subject: [PATCH] 2025年05月07日15:18:20 1.2.0

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 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 ef25a07..05d0f10 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -11,6 +11,7 @@
 import com.hdl.photovoltaic.internet.api.HttpApi;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
+import com.hdl.photovoltaic.ui.bean.UnCountBean;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -23,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<>();
 
 
@@ -192,7 +193,8 @@
                     break;
                 }
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            String ss = e.getMessage();
         }
     }
 
@@ -222,7 +224,7 @@
             }
         } catch (Exception e) {
             String mes = e.getMessage();
-            HdlLogLogic.print("--->" + mes);
+            HdlLogLogic.print("---" + mes);
         }
     }
 
@@ -253,7 +255,7 @@
             }
         } catch (Exception e) {
             String mes = e.getMessage();
-            HdlLogLogic.print("--->" + mes);
+            HdlLogLogic.print("---" + mes);
         }
     }
 
@@ -308,7 +310,7 @@
      *
      * @param cloudCallBeak -
      */
-    public void getMessageUntreatedCount(String homeId, CloudCallBeak<String> cloudCallBeak) {
+    public void getMessageUntreatedCount(String homeId, CloudCallBeak<UnCountBean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Message_UntreatedCount;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
@@ -317,8 +319,16 @@
         HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String str) {
+                if (TextUtils.isEmpty(str)) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(new UnCountBean());
+                    }
+                    return;
+                }
+
+                UnCountBean unCountBean = new Gson().fromJson(str, UnCountBean.class);
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onSuccess(str);
+                    cloudCallBeak.onSuccess(unCountBean);
                 }
             }
 
@@ -489,19 +499,31 @@
 
     }
 
+
     /**
-     * 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃(鐢ㄤ簬C绔�)
+     * 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃
      *
-     * @param homeId                  鐢电珯id
+     * @param homeId                  鐢电珯id(濉�""榛樿璐﹀彿涓嬫墍鏈夋秷鎭�)
      * @param pageNo                  椤电爜
      * @param messageStateType        all:鍏ㄩ儴,UNTREATED:鏈鐞�,PROCESSED:宸插鐞�;
      * @param deviceType_filter_key   绫诲瀷锛堣澶囷紝绛夌骇锛屾椂闂达級
      * @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_C(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) {
+    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_List;
         JsonObject json = new JsonObject();
         if (!TextUtils.isEmpty(homeId)) {
@@ -518,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);//椤垫暟
@@ -618,13 +643,15 @@
     /**
      * 娑堟伅鍏ㄩ儴宸茶
      *
-     * @param homeId        娑堟伅id
+     * @param homeId        娑堟伅id(涓嶄紶宸茶鎵�鏈夌數绔欑殑锛屼紶鍊煎凡璇绘寚瀹氱數绔欑殑)
      * @param cloudCallBeak -
      */
     public void messageAllRead(String homeId, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Message_AllRead;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", homeId);
+        if (!TextUtils.isEmpty(homeId)) {
+            json.addProperty("homeId", homeId);
+        }
         HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String str) {

--
Gitblit v1.8.0