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/MessageInfoActivity.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 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 80d727b..2085582 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
@@ -1,7 +1,6 @@
package com.hdl.photovoltaic.ui.message;
-import android.annotation.SuppressLint;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
@@ -35,6 +34,7 @@
private MessageBean mMessageBean;
private String mMsgId;
+ private String mMessageStateType;
@Override
public Object getContentView() {
@@ -48,6 +48,7 @@
setStatusBarTextColor();
try {
mMsgId = getIntent().getStringExtra("msgId");
+ mMessageStateType = getIntent().getStringExtra("messageStateType");
} catch (Exception ignored) {
}
@@ -91,8 +92,8 @@
type = _mActivity.getString(R.string.message_alarm);
drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
- type = _mActivity.getString(R.string.event);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
+ type = _mActivity.getString(R.string.loading_title_tip);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.state_b9b9b9);
}
viewBinding.messageInfoAlarmStateTv.setText(type);
viewBinding.messageInfoAlarmStateTv.setBackground(drawable);
@@ -116,7 +117,7 @@
private void initEvent() {
//鍚庨��鐨勪簨浠�
- viewBinding.toolbarTopIn.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopIn.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mMessageBean == null) {
@@ -125,18 +126,20 @@
}
//鏈鐞�
if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setTopic(ConstantManage.message_function_push_post);
+
//鏀瑰彉缂撳瓨鐘舵��
if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
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);
} else {
//闄も�滄晠闅溾�濆锛屽叾浠栫瓑绾т俊鎭�滃凡璇烩�濆悗锛岃嚜鍔ㄧЩ鍑衡�滃彂鐢熶腑鈥濆垪琛ㄥ苟鍔犲叆鈥滃巻鍙茶褰曗�濆垪琛�
HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.processed);
- baseEventBus.setType(MessageStateType.processed);
+ sendEventBus();
}
- EventBus.getDefault().post(baseEventBus);
+
}
finish();
}
@@ -151,18 +154,18 @@
}
//鏈鐞�
if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setTopic(ConstantManage.message_function_push_post);
//鏀瑰彉缂撳瓨鐘舵��
if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
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);
} else {
//闄も�滄晠闅溾�濆锛屽叾浠栫瓑绾т俊鎭�滃凡璇烩�濆悗锛岃嚜鍔ㄧЩ鍑衡�滃彂鐢熶腑鈥濆垪琛ㄥ苟鍔犲叆鈥滃巻鍙茶褰曗�濆垪琛�
HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.processed);
- baseEventBus.setType(MessageStateType.processed);
+ sendEventBus();
}
- EventBus.getDefault().post(baseEventBus);
}
finish();
}
@@ -181,21 +184,9 @@
//鏈鐞�
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);
+ sendEventBus();
}
finish();
-
-
}
@Override
@@ -210,12 +201,28 @@
}
+ /**
+ * 閫氱煡鍑哄幓澶栭潰鏇存柊鏁版嵁
+ */
+ private void sendEventBus() {
+ //閫氱煡宸插鐞嗚鏇存柊鏁版嵁
+ 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);
+ }
+
private void initView() {
viewBinding.toolbarTopIn.topTitleTv.setText(R.string.message_alarm_info);
viewBinding.toolbarTopIn.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopIn.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopIn.topBackLl.setVisibility(View.VISIBLE);
viewBinding.toolbarTopIn.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
if (!UserConfigManage.getInstance().isBAccount()) {
@@ -235,5 +242,11 @@
viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText("");
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText("");
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText("");
+
+ if (mMessageStateType.equals(MessageStateType.processed)) {
+ //宸茬粡瑙ｅ喅鎺夌殑闅愯棌
+ viewBinding.messageInfoBackTv.setVisibility(View.GONE);
+ viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0