From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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..e5e7875 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
@@ -11,6 +11,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.R;
@@ -104,7 +105,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();
@@ -148,7 +149,7 @@
                 viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
                 viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
                 List<String> stringList = getTypeList(FilterType.deviceType);
-                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allDeviceTitleTv.getText().toString());
                 typeTitleListDialog.show();
                 typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
                     @Override
@@ -173,7 +174,7 @@
                 viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.up);
                 viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
                 List<String> stringList = getTypeList(FilterType.type);
-                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allGradeTitleTv.getText().toString());
                 typeTitleListDialog.show();
                 typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
                     @Override
@@ -194,7 +195,7 @@
                 viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
                 viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.up);
                 List<String> stringList = getTypeList(FilterType.timeType);
-                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+                TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allTimeTitleTv.getText().toString());
                 typeTitleListDialog.show();
                 typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
                     @Override
@@ -270,7 +271,7 @@
                 @Override
                 public void onClick(int position, MessageBean messageBean) {
                     Intent intent = new Intent();
-                    intent.putExtra("msgId", messageBean.getMsgId().toString());
+                    intent.putExtra("messageBean", new Gson().toJson(messageBean));
                     intent.setClass(_mActivity, MessageInfoActivity.class);
                     startActivity(intent);
                 }
@@ -281,7 +282,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 +337,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