From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 fc0caa2..f5dd23d 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
@@ -28,7 +28,7 @@
import com.hdl.photovoltaic.ui.adapter.MessageAdapter;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
-import com.hdl.photovoltaic.widget.TypeTitleListDialog;
+import com.hdl.photovoltaic.widget.BTypeTitleListDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -219,8 +219,15 @@
mMessageAdapter.setOnclickListener(new MessageAdapter.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);
}
@@ -237,9 +244,9 @@
* @param stringList 杩囨护绫诲瀷鍊艰〃
*/
private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) {
- TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+ BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList);
typeTitleListDialog.show();
- typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
+ typeTitleListDialog.setOnListener(new BTypeTitleListDialog.OnClickListener() {
@Override
public void onClick(int position, String title) {
textView.setText(title);
@@ -298,7 +305,7 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
//杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�)
- initData();
+// initData();
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭秷鎭��");
}
--
Gitblit v1.8.0