Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -24,6 +24,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 +46,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);
@@ -113,7 +114,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,14 +206,8 @@

    private void initView() {

        viewBinding.toolbarTopIn.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopIn.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.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);

        viewBinding.messageInfoAlarmContentIn.leftTitleTv.setText(R.string.messagealarm_details_content);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
@@ -255,7 +250,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);
    }