From 3ccff7173fb73322f7785d8eaedc90a1b5d8765d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 10 十二月 2024 22:44:03 +0800
Subject: [PATCH] 2024年12月10日22:43:59
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 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 f1c7027..0f419e0 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
@@ -24,6 +24,7 @@
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+import com.jaeger.library.StatusBarUtil;
import org.greenrobot.eventbus.EventBus;
@@ -45,8 +46,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+
try {
String json = getIntent().getStringExtra("messageBean");
mMessageBean = new Gson().fromJson(json, MessageBean.class);
@@ -92,6 +93,12 @@
//宸茬粡瑙ｅ喅鎺夌殑闅愯棌
viewBinding.messageInfoBackTv.setVisibility(View.GONE);
viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ } else {
+ if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ return;
+ }
+ viewBinding.messageInfoBackTv.setVisibility(View.GONE);
+ viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
}
}
});
@@ -107,7 +114,7 @@
private void initEvent() {
//鍚庨��鐨勪簨浠�
- viewBinding.toolbarTopIn.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mMessageBean == null) {
@@ -199,10 +206,8 @@
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.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopIn.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
if (!UserConfigManage.getInstance().isBAccount()) {
viewBinding.messageInfoBackTv.setTextColor(getColor(R.color.text_38C494));
@@ -226,10 +231,9 @@
stateStyle(viewBinding.messageInfoAlarmStateTv);
- if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
- //宸茬粡瑙ｅ喅鎺夌殑闅愯棌
- viewBinding.messageInfoBackTv.setVisibility(View.GONE);
- viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ //鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
+ viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
}
}
@@ -241,18 +245,40 @@
*/
private void stateStyle(TextView textView) {
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
- Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
+ Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);
if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
type = _mActivity.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_e34343);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_fff55252);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.warn)) {
type = _mActivity.getString(R.string.message_alarm);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
type = _mActivity.getString(R.string.loading_title_tip);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_ffb9b9b9);
}
- textView.setText(type);
+// textView.setText(type);
textView.setBackground(drawable);
}
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ if (mMessageBean == null) {
+ return;
+ }
+ //鏈鐞�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ //鏀瑰彉缂撳瓨鐘舵��
+ if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
+ //閫氱煡鏈鐞嗚鏇存柊鏁版嵁
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.message_function_push_post, MessageStateType.untreated);
+ } else {
+ //闄も�滄晠闅溾�濆锛屽叾浠栫瓑绾т俊鎭�滃凡璇烩�濆悗锛岃嚜鍔ㄧЩ鍑衡�滃彂鐢熶腑鈥濆垪琛ㄥ苟鍔犲叆鈥滃巻鍙茶褰曗�濆垪琛�
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.processed);
+ sendEventBus();
+ }
+
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0