From b1f617d201ada34081aefc38414813cbf521fed5 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 20 五月 2024 20:38:17 +0800
Subject: [PATCH] 2024年05月20日20:26:17

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
index 5384da5..fc0caa2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -117,7 +117,14 @@
         viewBinding.messageSearchCl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                String messageStateType;
+                if (isAlarmDeviceClick) {
+                    messageStateType = MessageStateType.untreated;
+                } else {
+                    messageStateType = MessageStateType.processed;
+                }
                 Intent intent = new Intent();
+                intent.putExtra("MessageStateType", messageStateType);
                 intent.setClass(_mActivity, SearchMessageActivity.class);
                 startActivity(intent);
             }
@@ -236,8 +243,23 @@
             @Override
             public void onClick(int position, String title) {
                 textView.setText(title);
-                mTimeTypeFilterKye = filterType;
-                mTimeTypeFilterValue = findFilterValueString(title);
+                switch (filterType) {
+                    case FilterType.deviceType: {
+                        mDeviceTypeFilterKye = filterType;
+                        mDeviceTypeFilterValue = findFilterValueString(title);
+                    }
+                    break;
+                    case FilterType.type: {
+                        mTypeFilterKye = filterType;
+                        mTypeFilterValue = findFilterValueString(title);
+                    }
+                    break;
+                    case FilterType.timeType: {
+                        mTimeTypeFilterKye = filterType;
+                        mTimeTypeFilterValue = findFilterValueString(title);
+                    }
+                    break;
+                }
                 loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
             }
         });

--
Gitblit v1.8.0