From bae677bcbf12e6e7bff63baff362f3ce91184a62 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 09 五月 2024 17:49:33 +0800
Subject: [PATCH] 2024年05月09日17:49:28

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/AllMessageFragment.java |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/AllMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/AllMessageFragment.java
index fe7d003..8597c39 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/AllMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/AllMessageFragment.java
@@ -17,9 +17,14 @@
 import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 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.MessageBean;
 import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,15 +57,8 @@
     }
 
     private void initData() {
-//        mList.clear();
-//        for (int i = 0; i < 5; i++) {
-//            MessageBean messageBean = new MessageBean();
-////            messageBean.setContent("鏉ヤ簡涓�鏉″憡璀︿俊鎭�" + i);
-//            messageBean.setHomeName(i + "");
-////            messageBean.setTime("2023-12-06-15");
-//            messageBean.setRead(false);
-//            mList.add(messageBean);
-//        }
+        mList.clear();
+        mList.addAll(HdlMessageLogic.getInstance().getAllMessageList());
     }
 
 
@@ -72,6 +70,7 @@
             @Override
             public void onRefresh() {
                 mList.clear();//琛ㄧず寮哄埗閲嶆柊璇锋眰娑堟伅鍒楄〃
+                updateListData();//娓呯┖涔嬪墠缂撳瓨,鍥犱负閬囧埌涓�涓棶棰樼寷鎷夌殑鏃跺�欐姤閿�;
                 getAllMessageList(false);
                 HdlLogLogic.print("AllMessageFragment涓嬫媺鍒锋柊", false);
             }
@@ -110,14 +109,25 @@
         }
     }
 
-    @Override
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void onEventMessage(BaseEventBus eventBus) {
         super.onEventMessage(eventBus);
+        if (eventBus == null) {
+            return;
+        }
         //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
         if (eventBus.getTopic().equals(ConstantManage.message_function_tab_switch)) {
             if (eventBus.getType().equals(MessageFunctionTabSwitch.all.toString())) {
+                initData();
                 getAllMessageList(true);
-                HdlLogLogic.print("姝e湪鐐瑰嚮銆愬叏閮ㄣ��");
+                // 鍙栨秷绮樻�т簨浠�
+                EventBus.getDefault().removeStickyEvent(eventBus);
+            }
+        } else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
+            if (eventBus.getType().equals(MessageStateType.all)) {
+                //娑堟伅璇︽儏鍥炶皟
+//                initData();
+//                updateListData();
             }
         }
     }
@@ -135,17 +145,23 @@
             HdlMessageLogic.getInstance().getAllMessageList(new CloudCallBeak<List<MessageBean>>() {
                 @Override
                 public void onSuccess(List<MessageBean> list) {
-                    if (isShowLoading) {
-                        hideLoading();
-                    }
-                    if (!isShowLoading) {
-                        viewBinding.messageAllSrl.setRefreshing(false);
-                    }
 
-                    if (list != null && list.size() != 0) {
-                        mList.addAll(list);
-                        updateListData();
-                    }
+                    HdlThreadLogic.runMainThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isShowLoading) {
+                                hideLoading();
+                            }
+                            if (!isShowLoading) {
+                                viewBinding.messageAllSrl.setRefreshing(false);
+                            }
+
+                            if (list != null && list.size() != 0) {
+                                mList.addAll(list);
+                                updateListData();
+                            }
+                        }
+                    });
                 }
 
                 @Override

--
Gitblit v1.8.0