From 07fb950b0f6c460e4cc60c4e262bc5992074790e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 三月 2024 20:49:08 +0800
Subject: [PATCH] 2024年03月26日20:49:02
---
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 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 b1af7fc..54702bc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -74,6 +74,21 @@
return sortList(newList);
}
+ /**
+ * 娑堟伅鍏ㄩ儴宸茶(鏈湴缂撳瓨)
+ *
+ * @param isRead 鏄惁璇诲彇(true宸茶鍙�)
+ */
+ public void setAllRead(boolean isRead) {
+ for (int i = 0; i < mListMessage.size(); i++) {
+ MessageBean messageBean = mListMessage.get(i);
+ if (messageBean == null) {
+ continue;
+ }
+ messageBean.setRead(isRead);
+ }
+ }
+
/**
* 鑾峰彇鎭㈠涓紦瀛樺垪琛�
@@ -201,9 +216,9 @@
}
/**
- * 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�
+ * 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�(鍗曚釜鎻掑叆)
*
- * @param messageBean -
+ * @param messageBean 鍗曚釜
* @param position 琛ㄧず鍔犲埌鍒楄〃鐨勪綅缃�
*/
public void setListMessage(MessageBean messageBean, int position) {
@@ -234,7 +249,7 @@
/**
* 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�
*
- * @param list -
+ * @param list 鍒楄〃
*/
public void setListMessage(List<MessageBean> list) {
try {
@@ -282,9 +297,12 @@
*
* @param cloudCallBeak -
*/
- public void getMessageUntreatedCount(CloudCallBeak<String> cloudCallBeak) {
+ public void getMessageUntreatedCount(String homeId, CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.POST_Message_UntreatedCount;
JsonObject json = new JsonObject();
+ if (!TextUtils.isEmpty(homeId)) {
+ json.addProperty("homeId", homeId);
+ }
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String str) {
@@ -463,23 +481,32 @@
/**
* 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃(鐢ㄤ簬C绔�)
*
- * @param pageNo 椤电爜
- * @param messageStateType all:鍏ㄩ儴,UNTREATED:鏈鐞�,PROCESSED:宸插鐞�;
- * @param filter_key 绫诲瀷锛堣澶囷紝绛夌骇锛屾椂闂达級
- * @param 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 cloudCallBeak -
+ * @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 cloudCallBeak -
*/
- public void getPageNoMessageList_C(int pageNo, String messageStateType, String filter_key, String filter_value, CloudCallBeak<MessageListClass> 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) {
String requestUrl = HttpApi.POST_Message_List;
JsonObject json = new JsonObject();
-
+ if (!TextUtils.isEmpty(homeId)) {
+ json.addProperty("homeId", homeId);
+ }
if (!MessageStateType.all.equals(messageStateType)) {
json.addProperty("status", messageStateType);
}
- if (!TextUtils.isEmpty(filter_key) && !TextUtils.isEmpty(filter_value)) {
- json.addProperty(filter_key, filter_value);
+ if (!TextUtils.isEmpty(deviceType_filter_key) && !TextUtils.isEmpty(deviceType_filter_value)) {
+ json.addProperty(deviceType_filter_key, deviceType_filter_value);
+ }
+ if (!TextUtils.isEmpty(type_filter_key) && !TextUtils.isEmpty(type_filter_value)) {
+ json.addProperty(type_filter_key, type_filter_value);
+ }
+ if (!TextUtils.isEmpty(timeType_filter_key) && !TextUtils.isEmpty(timeType_filter_value)) {
+ json.addProperty(timeType_filter_key, timeType_filter_value);
}
json.addProperty("pageNo", pageNo);//椤电爜
json.addProperty("pageSize", pageSize);//椤垫暟
--
Gitblit v1.8.0