From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java |   68 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
index 6fc5db8..04659b7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
@@ -13,12 +13,19 @@
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.databinding.FragmentRecoverMessageBinding;
 import com.hdl.photovoltaic.enums.MessageFunctionTabSwitch;
+import com.hdl.photovoltaic.enums.MessageStateType;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 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.BUserInfo;
 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;
@@ -44,7 +51,7 @@
     public void onBindView(Bundle savedInstanceState) {
 
         //鍒濆鍖栨暟鎹�
-        initData();
+//        initData();
         //鍒濆鍖栫晫闈�
         initView();
         //鍒濆鍖栫洃鍚櫒
@@ -52,14 +59,8 @@
     }
 
     private void initData() {
-        for (int i = 0; i < 2; 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().getRecoverMessageMemoryList());
     }
 
     private void initEvent() {
@@ -69,15 +70,18 @@
             @Override
             public void onRefresh() {
                 mList.clear();//琛ㄧず寮哄埗閲嶆柊璇锋眰娑堟伅鍒楄〃
+                updateListData();//娓呯┖涔嬪墠缂撳瓨,鍥犱负閬囧埌涓�涓棶棰樼寷鎷夌殑鏃跺�欐姤閿�;
                 getRecoverMessageList(false);
-                HdlLogLogic.print("RecoverMessageFragment涓嬫媺鍒锋柊", false);
             }
         });
         messageRecoverAdapter.setNoOnclickListener(new MessageAdapter.OnclickListener() {
             @Override
             public void onClick(int position, MessageBean item) {
+                if (position < 0 || position > mList.size()) {
+                    return;
+                }
                 Intent intent = new Intent();
-                intent.putExtra("message_info", new Gson().toJson(item));
+                intent.putExtra("msgId", item.getMsgId().toString());
                 intent.setClass(_mActivity, MessageInfoActivity.class);
                 startActivity(intent);
             }
@@ -101,14 +105,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.recover.toString())) {
-                HdlLogLogic.print("姝e湪鐐瑰嚮銆愬凡鎭㈠銆�");
+                initData();
                 getRecoverMessageList(true);
+                // 鍙栨秷绮樻�т簨浠�
+                EventBus.getDefault().removeStickyEvent(eventBus);
+            }
+        } else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
+            if (eventBus.getType().equals(MessageStateType.processed)) {
+                //娑堟伅璇︽儏鍥炶皟
+                initData();
+                updateListData();
             }
         }
     }
@@ -125,20 +140,25 @@
             if (isShowLoading) {
                 showLoading();
             }
-            HdlMessageLogic.getInstance().getMessageList(HdlMessageLogic.MessageStatus.processed, new CloudCallBeak<List<MessageBean>>() {
+            HdlMessageLogic.getInstance().getRecoverMessageList(new CloudCallBeak<List<MessageBean>>() {
                 @Override
                 public void onSuccess(List<MessageBean> list) {
-                    if (isShowLoading) {
-                        hideLoading();
-                    }
-                    if (!isShowLoading) {
-                        viewBinding.messageRecoverSrl.setRefreshing(false);
-                    }
+                    HdlThreadLogic.runMainThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isShowLoading) {
+                                hideLoading();
+                            }
+                            if (!isShowLoading) {
+                                viewBinding.messageRecoverSrl.setRefreshing(false);
+                            }
 
-                    if (list != null && list.size() != 0) {
-                        mList.addAll(list);
-                        updateListData();
-                    }
+                            if (list != null && list.size() != 0) {
+                                mList.addAll(list);
+                                updateListData();
+                            }
+                        }
+                    });
                 }
 
                 @Override

--
Gitblit v1.8.0