Merge branch '1.4.4' into dev

wjc

2 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -112,6 +112,23 @@
                            viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
                        }

                        if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
                            viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
                            viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
                            viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
                            viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
                            viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
                            viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
                            viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
                        }


                        if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
                            //已经解决掉的隐藏
                            viewBinding.messageInfoBackTv.setVisibility(View.GONE);
@@ -229,16 +246,16 @@

    private void initView() {

        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);


        viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
        viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
        viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.event_device);
        viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
        viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
        viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
        viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);

        viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
@@ -283,6 +300,22 @@
        if (TextUtils.isEmpty(mMessageBean.getPlan())) {
            viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
        }

        if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
            viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
            viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
            viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
            viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
            viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
            viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
        } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
            viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
        }
    }