From b01d34b480389b59b6cc77301a1cd54048867195 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 28 五月 2024 14:53:29 +0800 Subject: [PATCH] 2024年05月28日14:53:17 --- app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 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..63ab6ef 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 @@ -92,6 +92,12 @@ //宸茬粡瑙e喅鎺夌殑闅愯棌 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); } } }); @@ -230,6 +236,12 @@ //宸茬粡瑙e喅鎺夌殑闅愯棌 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); } } @@ -255,4 +267,26 @@ 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