From 125b1775618a0e6c650d76be051b6f16a559bb1a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 16:00:38 +0800
Subject: [PATCH] 2024年05月21日16:00:32

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 bb187e1..fcc2f67 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();
@@ -269,8 +269,17 @@
             messageCenterListAdapter.setNoOnclickListener(new MessageCenterListAdapter.OnclickListener() {
                 @Override
                 public void onClick(int position, MessageBean messageBean) {
+
+
+                    String messageStateType;
+                    if (isAlarmDeviceClick) {
+                        messageStateType = MessageStateType.untreated;
+                    } else {
+                        messageStateType = MessageStateType.processed;
+                    }
                     Intent intent = new Intent();
                     intent.putExtra("msgId", messageBean.getMsgId().toString());
+                    intent.putExtra("messageStateType", messageStateType);
                     intent.setClass(_mActivity, MessageInfoActivity.class);
                     startActivity(intent);
                 }
@@ -281,7 +290,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 +345,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) {

--
Gitblit v1.8.0