From 636c4bb04e4fcd723766b82732990cdb4ae4ea2e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 二月 2024 15:48:23 +0800
Subject: [PATCH] 删除掉本地库
---
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java | 241 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 172 insertions(+), 69 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 f6c19bb..f0f7534 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.other;
+import android.os.Build;
import android.text.TextUtils;
import com.google.gson.Gson;
@@ -12,6 +13,7 @@
import com.hdl.photovoltaic.ui.bean.MessageBean;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -21,7 +23,9 @@
public class HdlMessageLogic {
private static volatile HdlMessageLogic sHdlMessageLogic;
- private int pageSize = 50;//椤垫暟
+ private final int pageSize = 50;//椤垫暟
+ private List<MessageBean> mListMessage = new ArrayList<>();
+
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -40,6 +44,12 @@
return sHdlMessageLogic;
}
+ public void clearListMessage() {
+ if (mListMessage.size() > 0) {
+ mListMessage.clear();
+ }
+ }
+
/**
* 鑾峰彇鍙戠敓涓紦瀛樺垪琛�
*/
@@ -50,13 +60,17 @@
List<MessageBean> newList = new ArrayList<>();
for (int i = 0; i < mListMessage.size(); i++) {
MessageBean messageBean = mListMessage.get(i);
+ if (messageBean == null) {
+ continue;
+ }
if (messageBean.getStatus().equals(MessageStateType.untreated)) {
newList.add(messageBean);
}
}
- return newList;
+ return sortList(newList);
}
+
/**
* 鑾峰彇鎭㈠涓紦瀛樺垪琛�
@@ -73,6 +87,49 @@
}
}
+ return sortList(newList);
+ }
+
+ /**
+ * 鍒楄〃杩涜鎺掑簭
+ *
+ * @param list 婧愭暟鎹�
+ * @return -
+ */
+ private List<MessageBean> sortList(List<MessageBean> list) {
+ List<MessageBean> newList = new ArrayList<>();
+ List<MessageBean> readList = new ArrayList<>();
+ List<MessageBean> unReadList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ MessageBean messageBean = list.get(i);
+ if (messageBean.isRead()) {
+ //宸茶
+ readList.add(messageBean);
+ } else {
+ //鏈
+ unReadList.add(messageBean);
+ }
+
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ readList.sort(new Comparator<MessageBean>() {
+ @Override
+ public int compare(MessageBean o1, MessageBean o2) {
+ if (o1 == null && o2 == null) {
+ return -1;
+ }
+ //鍊掑簭锛堥『搴� Long.compare(o2.getCreateTime(), o1.getCreateTime())锛�
+ return Long.compare(o1.getCreateTime(), o2.getCreateTime());
+ }
+ });
+ }
+
+ if (unReadList.size() > 0) {
+ newList.addAll(unReadList);
+ }
+ if (readList.size() > 0) {
+ newList.addAll(readList);
+ }
return newList;
}
@@ -80,22 +137,31 @@
return mListMessage;
}
+
/**
- * 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�
+ * 璁剧疆璇诲彇鐘舵��
*
- * @param list -
+ * @param msgId -娑堟伅ID
+ * @param read 鏄惁宸茶鍙� true琛ㄧず宸茶鍙�
+ * @param messageStateType UNTREATED : 鏈鐞嗭紝PROCESSED 锛� 宸插鐞�
*/
- public void setListMessage(List<MessageBean> list) {
+ public void setMessageState(long msgId, boolean read, String messageStateType) {
try {
- if (list == null || list.size() == 0) {
+ if (msgId == 0) {
return;
}
- if (this.mListMessage.size() == 0) {
- this.mListMessage.addAll(list);
- return;
- }
- for (int i = 0; i < list.size(); i++) {
- this.setListMessage(list.get(i));
+ for (int i = 0; i < mListMessage.size(); i++) {
+ MessageBean messageBean = mListMessage.get(i);
+ if (messageBean == null) {
+ continue;
+ }
+ if (messageBean.getMsgId() == msgId) {
+ messageBean.setRead(read);
+ if (!TextUtils.isEmpty(messageStateType)) {
+ messageBean.setStatus(messageStateType);
+ }
+ break;
+ }
}
} catch (Exception ignored) {
}
@@ -125,13 +191,88 @@
//娌℃湁娣诲姞
this.mListMessage.add(messageBean);
}
+ } catch (Exception e) {
+ String mes = e.getMessage();
+ HdlLogLogic.print("--->" + mes);
+ }
+ }
+
+ /**
+ * 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�
+ *
+ * @param messageBean -
+ * @param position 琛ㄧず鍔犲埌鍒楄〃鐨勪綅缃�
+ */
+ public void setListMessage(MessageBean messageBean, int position) {
+ try {
+ if (messageBean == null) {
+ return;
+ }
+ boolean if_boolean = false;
+ for (int i = 0; i < mListMessage.size(); i++) {
+ if (mListMessage.get(i).getMsgId().toString().equals(messageBean.getMsgId().toString())) {
+ //瀛樺湪鏇挎崲
+ mListMessage.remove(i);
+ mListMessage.add(i, messageBean);
+ if_boolean = true;
+ break;
+ }
+ }
+ if (!if_boolean) {
+ //娌℃湁娣诲姞
+ this.mListMessage.add(position, messageBean);
+ }
+ } catch (Exception e) {
+ String mes = e.getMessage();
+ HdlLogLogic.print("--->" + mes);
+ }
+ }
+
+ /**
+ * 娣诲姞娑堟伅鍒板垪琛ㄩ噷闈�
+ *
+ * @param list -
+ */
+ public void setListMessage(List<MessageBean> list) {
+ try {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ if (this.mListMessage.size() == 0) {
+ this.mListMessage.addAll(list);
+ return;
+ }
+ for (int i = 0; i < list.size(); i++) {
+ this.setListMessage(list.get(i));
+ }
} catch (Exception ignored) {
}
}
- private List<MessageBean> mListMessage = new ArrayList<>();
+ /**
+ * 鑾峰彇鏈鐞嗙紦瀛樻秷鎭暟閲�
+ */
+ public String getMessageUntreatedMemoryCount() {
+ if (this.mListMessage == null || this.mListMessage.size() == 0) {
+ return "0";
+ }
+ List<MessageBean> newList = new ArrayList<>();
+ for (int i = 0; i < mListMessage.size(); i++) {
+ MessageBean messageBean = mListMessage.get(i);
+ if (messageBean == null) {
+ continue;
+ }
+ if (!messageBean.getStatus().equals(MessageStateType.untreated)) {
+ continue;
+ }
+ if (!messageBean.isRead()) {
+ newList.add(messageBean);
+ }
+ }
+ return newList.size() + "";
+ }
/**
* 鑾峰彇鏈鐞嗘秷鎭暟閲�
@@ -202,7 +343,7 @@
json.addProperty("status", messageStateType);
}
json.addProperty("pageNo", 1);//椤电爜
- json.addProperty("pageSize", 50);//椤垫暟
+ json.addProperty("pageSize", pageSize);//椤垫暟
List<MessageBean> list = new ArrayList<>();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -215,11 +356,11 @@
return;
}
Gson gson = new Gson();
- MessageListClass messageListClass = gson.fromJson(jsonStr, MessageListClass.class);
- list.addAll(messageListClass.getList());
- setListMessage(messageListClass.getList());
+ MessageListClass oldMessageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+ list.addAll(oldMessageListClass.getList());
+ setListMessage(oldMessageListClass.getList());
//鎬诲叡鏈夊灏戦〉
- long totalPage = messageListClass.totalPage;
+ long totalPage = oldMessageListClass.totalPage;
if (totalPage < 2) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(list);
@@ -235,9 +376,9 @@
@Override
public void onSuccess(String jsonStr) {
atomicInteger.set(atomicInteger.get() + 1);
- MessageListClass messageListClass1 = gson.fromJson(jsonStr, MessageListClass.class);
- list.addAll(messageListClass1.getList());
- setListMessage(messageListClass.getList());
+ MessageListClass newMessageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+ list.addAll(newMessageListClass.getList());
+ setListMessage(newMessageListClass.getList());
if (atomicInteger.get() == totalPage - 1) {
//鏈�鍚庝竴鏉￠��鍑�
if (cloudCallBeak != null) {
@@ -272,74 +413,36 @@
}
/**
- * 鑾峰彇娑堟伅鍒楄〃
+ * 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃
*
+ * @param pageNo 椤电爜
* @param messageStateType all:鍏ㄩ儴,UNTREATED:鏈鐞�,PROCESSED:宸插鐞�;
* @param cloudCallBeak -
*/
- private void getMessageList(int pageNo, String messageStateType, CloudCallBeak<List<MessageBean>> cloudCallBeak) {
+ public void getPageNoMessageList(int pageNo, String messageStateType, CloudCallBeak<MessageListClass> cloudCallBeak) {
String requestUrl = HttpApi.POST_Message_List;
JsonObject json = new JsonObject();
if (!MessageStateType.all.equals(messageStateType)) {
json.addProperty("status", messageStateType);
}
- json.addProperty("pageNo", 1);//椤电爜
+ json.addProperty("pageNo", pageNo);//椤电爜
json.addProperty("pageSize", pageSize);//椤垫暟
- 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<>());
+ cloudCallBeak.onSuccess(new MessageListClass());
}
return;
}
Gson gson = new Gson();
- MessageListClass messageListClass = gson.fromJson(jsonStr, MessageListClass.class);
- list.addAll(messageListClass.getList());
- setListMessage(messageListClass.getList());
- //鎬诲叡鏈夊灏戦〉
- long totalPage = messageListClass.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 messageListClass1 = gson.fromJson(jsonStr, MessageListClass.class);
- list.addAll(messageListClass1.getList());
- setListMessage(messageListClass.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);
- }
- }
- }
- });
+ MessageListClass oldMessageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+ setListMessage(oldMessageListClass.getList());
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(oldMessageListClass);
}
}
@@ -421,7 +524,7 @@
}
- static class MessageListClass {
+ public static class MessageListClass {
//鎬绘潯鏁�
private long totalCount;
--
Gitblit v1.8.0