Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java

@@ -92,6 +92,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);
                        }
                    }
                });
@@ -230,6 +236,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);
        }
    }

@@ -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();
            }

        }
    }
}