From 125b1775618a0e6c650d76be051b6f16a559bb1a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 16:00:38 +0800
Subject: [PATCH] 2024年05月21日16:00:32
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 c0b0223..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) {
@@ -186,8 +187,6 @@
sendEventBus();
}
finish();
-
-
}
@Override
@@ -223,7 +222,7 @@
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()) {
@@ -243,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