Merge branch '1.4.4' into dev

wjc

1 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -3,6 +3,7 @@

import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;

@@ -46,7 +47,7 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
       setStatusBarTranslucent();
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        try {
            String json = getIntent().getStringExtra("messageBean");
@@ -81,13 +82,52 @@
                        mMessageBean = msg;

                        viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
                        viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
                        viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
                        viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
                        viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
                        viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
                        viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
                        viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
                        String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
                        viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
                        viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());

                        stateStyle(viewBinding.messageInfoAlarmStateTv);

                        if (TextUtils.isEmpty(mMessageBean.getTitle())) {
                            viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getDescription())) {
                            viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getRemark())) {
                            viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
                            viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
                            viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
                        }
                        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);
                        }


                        if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
                            //已经解决掉的隐藏
@@ -206,22 +246,27 @@

    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.messageInfoAlarmContentIn.leftTitleTv.setText(R.string.messagealarm_details_content);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
        viewBinding.messageInfoAlarmRangeIn.leftTitleTv.setText(R.string.message_alarm_detailsaffect_region);

        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.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());
        viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
        viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
        viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
        viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
        viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
        viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
        viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
        String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
        viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
        viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
        stateStyle(viewBinding.messageInfoAlarmStateTv);


@@ -229,6 +274,48 @@
            //发生中的消息且是故障才要显示
            viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
        }

        if (UserConfigManage.getInstance().isBAccount()) {
            viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
//            viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
        } else {
//            viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
        }

        if (TextUtils.isEmpty(mMessageBean.getTitle())) {
            viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
        }
        if (TextUtils.isEmpty(mMessageBean.getDescription())) {
            viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
        }
        if (TextUtils.isEmpty(mMessageBean.getRemark())) {
            viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
        }
        if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
            viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
        }
        if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
            viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
        }
        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);
        }
    }