From fcf5f4e8176501e7c7a640746e03496986d0204a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 29 十二月 2023 13:36:10 +0800
Subject: [PATCH] 2023年12月29日13:36:05

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 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 0de0186..1bf65a5 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
@@ -1,6 +1,7 @@
 package com.hdl.photovoltaic.ui.message;
 
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -11,9 +12,11 @@
 import com.hdl.photovoltaic.base.CustomBaseFragment;
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.databinding.FragmentNascentMessageBinding;
+import com.hdl.photovoltaic.enums.MessageFunctionTabSwitch;
+import com.hdl.photovoltaic.enums.MessageStateType;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
 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;
@@ -29,7 +32,7 @@
 
     private MessageAdapter messageNascentAdapter;
 
-    private List<MessageBean> mList = new ArrayList<>();
+    private final List<MessageBean> mList = new ArrayList<>();
 
     @Override
     public Object getContentView() {
@@ -40,7 +43,7 @@
     @Override
     public void onBindView(Bundle savedInstanceState) {
         //鍒濆鍖栨暟鎹�
-        initData();
+//        initData();
         //鍒濆鍖栫晫闈�
         initView();
         //鍒濆鍖栫洃鍚櫒
@@ -48,15 +51,8 @@
     }
 
     private void initData() {
-//        mList = new ArrayList<>();
-//        for (int i = 0; i < 3; i++) {
-//            MessageBean messageBean = new MessageBean();
-//            messageBean.setTitle("鏉ヤ簡涓�鏉″憡璀︿俊鎭�" + i);
-//            messageBean.setHomeName(i + "");
-//            messageBean.setCreateTime((long) 1234567777);
-//            messageBean.setRead(false);
-//            mList.add(messageBean);
-//        }
+        mList.clear();
+        mList.addAll(HdlMessageLogic.getInstance().getNascentMessageMemoryList());
     }
 
     private void initEvent() {
@@ -66,12 +62,20 @@
             @Override
             public void onRefresh() {
                 mList.clear();//琛ㄧず寮哄埗閲嶆柊璇锋眰娑堟伅鍒楄〃
+                updateListData();//娓呯┖涔嬪墠缂撳瓨,鍥犱负閬囧埌涓�涓棶棰樼寷鎷夌殑鏃跺�欐姤閿�;
                 getNascentMessageList(false);
             }
         });
         messageNascentAdapter.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("msgId", item.getMsgId().toString());
+                intent.setClass(_mActivity, MessageInfoActivity.class);
+                startActivity(intent);
 
             }
         });
@@ -98,8 +102,15 @@
         super.onEventMessage(eventBus);
         //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
         if (eventBus.getTopic().equals(ConstantManage.message_function_tab_switch)) {
-            if (eventBus.getType().equals(HdlCommonLogic.MessageFunctionTabSwitch.nascent.toString())) {
+            if (eventBus.getType().equals(MessageFunctionTabSwitch.nascent.toString())) {
+                initData();
                 getNascentMessageList(true);
+            }
+
+        } else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
+            if (eventBus.getType().equals(MessageStateType.untreated)) {
+                initData();
+                updateListData();
             }
         }
     }
@@ -114,20 +125,26 @@
             if (isShowLoading) {
                 showLoading();
             }
-            HdlMessageLogic.getInstance().getMessageList(HdlMessageLogic.MessageStatus.untreated, new CloudCallBeak<List<MessageBean>>() {
+            HdlMessageLogic.getInstance().getNascentMessageList(new CloudCallBeak<List<MessageBean>>() {
                 @Override
                 public void onSuccess(List<MessageBean> list) {
-                    if (isShowLoading) {
-                        hideLoading();
-                    }
-                    if (!isShowLoading) {
-                        viewBinding.messageNascentSrl.setRefreshing(false);
-                    }
+                    HdlThreadLogic.runMainThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isShowLoading) {
+                                hideLoading();
+                            }
+                            if (!isShowLoading) {
+                                viewBinding.messageNascentSrl.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