From dbff6d6f9200417ea60e2fe507b79cbe2eb7ea32 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 一月 2024 18:19:48 +0800
Subject: [PATCH] 2024年01月11日18:19:42
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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..c9d4164 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;
/**
* 娑堟伅璇︽儏
@@ -71,23 +77,29 @@
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:浜嬩欢
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")) {
- type = "浜嬩欢";
+ } else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
+ type = _mActivity.getString(R.string.event);
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,17 @@
viewBinding.toolbarTopIn.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (mMessageBean == null) {
+ return;
+ }
+ //鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(ConstantManage.message_function_push_post);
+ baseEventBus.setType(MessageStateType.untreated);
+ EventBus.getDefault().post(baseEventBus);
+ }
finish();
}
});
@@ -111,6 +134,17 @@
viewBinding.messageInfoBackTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (mMessageBean == null) {
+ return;
+ }
+ //鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(ConstantManage.message_function_push_post);
+ baseEventBus.setType(MessageStateType.untreated);
+ EventBus.getDefault().post(baseEventBus);
+ }
finish();
}
});
@@ -121,7 +155,27 @@
HdlMessageLogic.getInstance().getMessageMessageSolve(mMsgId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ if (mMessageBean == null) {
+ return;
+ }
+ //鎭㈠杩涙潵鍙槸鏌ョ湅鐨�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ 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();
+
+
}
@Override
--
Gitblit v1.8.0