Merge branch '1.4.4' into dev

wjc

2 天以前 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;

@@ -24,6 +25,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 +47,8 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        try {
            String json = getIntent().getStringExtra("messageBean");
            mMessageBean = new Gson().fromJson(json, MessageBean.class);
@@ -80,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)) {
                            //已经解决掉的隐藏
@@ -113,7 +154,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) {
@@ -205,34 +246,75 @@

    private void initView() {

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

        if (!UserConfigManage.getInstance().isBAccount()) {
            viewBinding.messageInfoBackTv.setTextColor(getColor(R.color.text_38C494));
            viewBinding.messageInfoBackTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.fillet_line_38c494));
            viewBinding.messageInfoSolveTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.checked_38c494));
        }

        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);


        if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
            //发生中的消息且是故障才要显示
            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);
        }
    }

@@ -255,7 +337,7 @@
            type = _mActivity.getString(R.string.loading_title_tip);
            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_ffb9b9b9);
        }
        textView.setText(type);
//        textView.setText(type);
        textView.setBackground(drawable);
    }