From a583d00d2e629b72cae74864d67168ccb5f71daa Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 28 十二月 2023 21:46:24 +0800
Subject: [PATCH] 2023年12月28日21:46:15
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index 044b216..9dfa792 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -10,12 +10,18 @@
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.databinding.ActivityMessageInfoBinding;
+import com.hdl.photovoltaic.enums.MessageAlarmStateType;
+import com.hdl.photovoltaic.enums.MessageStateType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.TimeUtils;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+
+import org.greenrobot.eventbus.EventBus;
/**
* 娑堟伅璇︽儏
@@ -76,18 +82,24 @@
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
- if (mMessageBean.getType().equals("FAULT")) {
+ if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
type = _mActivity.getString(R.string.my_power_station_malfunction);
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_e34343);
- } else if (mMessageBean.getType().equals("WARN")) {
+ } else if (mMessageBean.getType().equals(MessageAlarmStateType.warn)) {
type = _mActivity.getString(R.string.message_alarm);
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
- } else if (mMessageBean.getType().equals("EVENT")) {
+ } else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
type = "浜嬩欢";
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
}
viewBinding.messageInfoAlarmStateTv.setText(type);
viewBinding.messageInfoAlarmStateTv.setBackground(drawable);
+
+ if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
+ //宸茬粡瑙ｅ喅鎺夌殑闅愯棌
+ viewBinding.messageInfoBackTv.setVisibility(View.GONE);
+ viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ }
}
});
}
@@ -104,6 +116,16 @@
viewBinding.toolbarTopIn.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ //鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ mMessageBean.setRead(true);
+ mMessageBean.setStatus(MessageStateType.untreated);
+ HdlMessageLogic.getInstance().setListMessage(mMessageBean);
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(ConstantManage.message_function_push_post);
+ baseEventBus.setType(MessageStateType.untreated);
+ EventBus.getDefault().post(baseEventBus);
+ }
finish();
}
});
@@ -121,7 +143,20 @@
HdlMessageLogic.getInstance().getMessageMessageSolve(mMsgId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ //鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ //閲嶇疆鍙橀噺
+ mMessageBean.setRead(true);
+ mMessageBean.setStatus(MessageStateType.processed);
+ HdlMessageLogic.getInstance().setListMessage(mMessageBean);
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(ConstantManage.message_function_push_post);
+ baseEventBus.setType(MessageStateType.processed);
+ EventBus.getDefault().post(baseEventBus);
+ }
finish();
+
+
}
@Override
--
Gitblit v1.8.0