From 88fa5aa9631b263e6e3d99d9ee787f73e78c6fda Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 14:54:53 +0800
Subject: [PATCH] 2024年05月17日14:54:51

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index b83e051..4d65283 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -104,7 +104,7 @@
 
     private void initEvent() {
         //杩斿洖鎸夐挳
-        viewBinding.toolbarTopMessageCenterListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopMessageCenterListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 clearCacheData();
@@ -281,7 +281,7 @@
 
     private void initView() {
         viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
-        viewBinding.toolbarTopMessageCenterListRl.topBackBtn.setVisibility(View.VISIBLE);
+        viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
         viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
         viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
         viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);
@@ -336,10 +336,11 @@
         } else {
             messageStateType = MessageStateType.processed;
         }
-        HdlMessageLogic.getInstance().getPageNoMessageList_C(UserConfigManage.getInstance().getHomeId(), pageNo, messageStateType,
+        HdlMessageLogic.getInstance().getPageNoMessageList(UserConfigManage.getInstance().getHomeId(), pageNo, messageStateType,
                 deviceType_filter_key, deviceType_filter_value,
                 type_filter_key, type_filter_value,
                 timeType_filter_key, timeType_filter_value,
+                "",
                 new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
                     @Override
                     public void onSuccess(HdlMessageLogic.MessageListClass messageListClass) {
@@ -496,7 +497,13 @@
      */
     private void updateCacheData() {
         mList.clear();
-        mList.addAll(HdlMessageLogic.getInstance().getAllMessageList());
+        if (isAlarmDeviceClick) {
+            //璁惧鎶ヨ
+            mList.addAll(HdlMessageLogic.getInstance().getNascentMessageMemoryList());
+        } else {
+            //鎶ヨ璁板綍
+            mList.addAll(HdlMessageLogic.getInstance().getRecoverMessageMemoryList());
+        }
     }
 
 

--
Gitblit v1.8.0