From b5b0b01715a4de1ea3cdf4804da46a546e4f9262 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 08 三月 2024 11:54:46 +0800
Subject: [PATCH] 2024年03月08日11:54:38
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 b17d003..584cc4f 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
@@ -77,7 +77,7 @@
viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
- String date = TimeUtils.getDateTimestamp(mMessageBean.getCreateTime());
+ String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
@@ -89,7 +89,7 @@
type = _mActivity.getString(R.string.message_alarm);
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
- type = "浜嬩欢";
+ type = _mActivity.getString(R.string.event);
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
}
viewBinding.messageInfoAlarmStateTv.setText(type);
@@ -113,14 +113,17 @@
}
private void initEvent() {
+ //鍚庨��鐨勪簨浠�
viewBinding.toolbarTopIn.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (mMessageBean == null) {
+ return;
+ }
//鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
- mMessageBean.setRead(true);
- mMessageBean.setStatus(MessageStateType.untreated);
- HdlMessageLogic.getInstance().setListMessage(mMessageBean);
+ //鏀瑰彉缂撳瓨鐘舵��
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(ConstantManage.message_function_push_post);
baseEventBus.setType(MessageStateType.untreated);
@@ -129,15 +132,17 @@
finish();
}
});
-
+ //杩斿洖鐨勪簨浠�
viewBinding.messageInfoBackTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (mMessageBean == null) {
+ return;
+ }
//鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
- mMessageBean.setRead(true);
- mMessageBean.setStatus(MessageStateType.untreated);
- HdlMessageLogic.getInstance().setListMessage(mMessageBean);
+ //鏀瑰彉缂撳瓨鐘舵��
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(ConstantManage.message_function_push_post);
baseEventBus.setType(MessageStateType.untreated);
@@ -147,22 +152,30 @@
}
});
+ //宸插鐞嗙殑浜嬩欢
viewBinding.messageInfoSolveTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
HdlMessageLogic.getInstance().getMessageMessageSolve(mMsgId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ if (mMessageBean == null) {
+ return;
+ }
//鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
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);
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.processed);
+
+ //閫氱煡宸插鐞嗚鏇存柊鏁版嵁
+ BaseEventBus processedBus = new BaseEventBus();
+ processedBus.setTopic(ConstantManage.message_function_push_post);
+ processedBus.setType(MessageStateType.processed);
+ EventBus.getDefault().post(processedBus);
+ //閫氱煡鏈鐞嗚鏇存柊鏁版嵁
+ BaseEventBus untreatedBus = new BaseEventBus();
+ untreatedBus.setTopic(ConstantManage.message_function_push_post);
+ untreatedBus.setType(MessageStateType.untreated);
+ EventBus.getDefault().post(untreatedBus);
}
finish();
--
Gitblit v1.8.0