From a0e8f81afc4fe2a21a5c504d53e569ea50d463d6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 三月 2024 11:51:23 +0800
Subject: [PATCH] 2024年03月15日11:51:17
---
app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
index 3c464aa..1417088 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
@@ -4,10 +4,7 @@
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
-import android.os.Handler;
import android.text.TextUtils;
-import android.util.Log;
-import android.view.MotionEvent;
import android.view.View;
import android.widget.TextView;
@@ -31,9 +28,7 @@
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.adapter.MessageAdapter;
-import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.MessageBean;
-import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -41,7 +36,6 @@
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -54,7 +48,7 @@
private final List<MessageBean> mList = new ArrayList<>();
private int currentPage = 0; // 褰撳墠椤电爜
- private int total = 0; // 鏈�鍚庨〉鐮�
+ private int currentTotal = 0; // 鎬婚〉鐮�
private boolean isLoadingMore = false; // 鏍囪姝ｅ湪鍔犺浇鏇村鏁版嵁
@@ -69,18 +63,14 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- //鍒濆鍖栨暟鎹�
-// initData();
//鍒濆鍖栫晫闈�
initView();
//鍒濆鍖栫洃鍚櫒
initEvent();
+ //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�)
+ loadNextPageNascentMessageList(1, true);
}
- private void initData() {
- mList.clear();
- mList.addAll(HdlMessageLogic.getInstance().getNascentMessageMemoryList());
- }
private void initEvent() {
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -89,9 +79,9 @@
@Override
public void onRefresh() {
viewBinding.messageNascentSrl.setRefreshing(false);
-// mList.clear();//琛ㄧず寮哄埗閲嶆柊璇锋眰娑堟伅鍒楄〃
-// updateListData();//娓呯┖涔嬪墠缂撳瓨,鍥犱负閬囧埌涓�涓棶棰樼寷鎷夌殑鏃跺�欐姤閿�;
-// getNascentMessageList(false);
+ mList.clear();//琛ㄧず寮哄埗閲嶆柊璇锋眰绗竴椤垫秷鎭垪琛�
+ HdlMessageLogic.getInstance().clearListMessage();//琛ㄧず寮哄埗娓呯┖鎵�鏈夌紦瀛樹俊鎭�
+ loadNextPageNascentMessageList(1, true);
}
});
messageNascentAdapter.setNoOnclickListener(new MessageAdapter.OnclickListener() {
@@ -145,8 +135,8 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- //鏇存柊缂撳瓨鏁版嵁
- initData();
+ //鏇存柊鏈湴缂撳瓨鏁版嵁
+ updatelocalityCacheData();
//鍒锋柊鍒楄〃
if (messageNascentAdapter != null) {
messageNascentAdapter.setList(mList);
@@ -214,9 +204,6 @@
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getTopic().equals(ConstantManage.message_function_tab_switch)) {
if (eventBus.getType().equals(MessageFunctionTabSwitch.nascent.toString())) {
- initData();
- loadNextPageNascentMessageList(1, true);
-// getUnreadCount();
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
@@ -225,11 +212,18 @@
} else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
if (eventBus.getType().equals(MessageStateType.untreated)) {
//娑堟伅璇︽儏鍥炶皟
- initData();
+ updatelocalityCacheData();
updateListData();
-// getUnreadCount();
}
}
+ }
+
+ /**
+ * 鏇存柊鏈湴缂撳瓨鏁版嵁
+ */
+ private void updatelocalityCacheData() {
+ mList.clear();
+ mList.addAll(HdlMessageLogic.getInstance().getNascentMessageMemoryList());
}
/**
@@ -239,11 +233,9 @@
* @param isShowLoading 鏄惁鍚姩鍔犺浇妗� true鍚姩
*/
private void loadNextPageNascentMessageList(int pageNo, boolean isShowLoading) {
- if (pageNo == 1 && mList.size() > 0) {
- //娌℃湁缂撳瓨鏁版嵁,鎵嶅彲浠ヨ鍙栫涓�椤�
- return;
- }
- if (currentPage > total) {
+ //绗竴椤佃鍙栨暟鎹己鍒惰
+ if (pageNo > 1 && currentPage > currentTotal) {
+ --currentPage;
//褰撳墠椤典笉鑳藉ぇ浜庢�婚〉鏁�
return;
}
@@ -255,7 +247,7 @@
@Override
public void onSuccess(HdlMessageLogic.MessageListClass messageListClass) {
if (messageListClass != null) {
- total = (int) messageListClass.getTotalPage();
+ currentTotal = (int) messageListClass.getTotalPage();
currentPage = (int) messageListClass.getPageNo();
updateListData();
}
@@ -282,7 +274,7 @@
* 璇诲彇娑堟伅銆愭湭璇绘暟閲忋��
*/
private void getUnreadCount() {
- HdlMessageLogic.getInstance().getMessageUntreatedCount(new CloudCallBeak<String>() {
+ HdlMessageLogic.getInstance().getMessageUntreatedCount("",new CloudCallBeak<String>() {
@Override
public void onSuccess(String data) {
--
Gitblit v1.8.0