Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.ui.message;

import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -30,6 +31,7 @@
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.widget.BTypeTitleListDialog;
import com.hdl.photovoltaic.widget.TypeTitleListDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
@@ -57,8 +59,8 @@
    private int mTotalCount = 0; //总条数
    private int mCurrentPage = 0; // 当前页码
    private int mCurrentTotal = 0; // 总页码
    private String mDeviceTypeFilterKye = FilterType.deviceType;//过滤类型 deviceType（INV ：逆变器；BMS ：BMS控制盒；BATTERY ：电池单元）
    private String mDeviceTypeFilterValue = FilterType.all;//过滤类型值 deviceType（INV ：逆变器；BMS ：BMS控制盒；BATTERY ：电池单元）
    private String mDeviceTypeFilterKye = FilterType.deviceType;//过滤类型 deviceType（INV ：逆变器；BMS ：BMS控制盒；BATTERY ：电池单元；"LOAD_CENTRE"：负载控制中心）
    private String mDeviceTypeFilterValue = FilterType.all;//过滤类型值 deviceType（INV ：逆变器；BMS ：BMS控制盒；BATTERY ：电池单元；"LOAD_CENTRE"：负载控制中心

    private String mTypeFilterKye = FilterType.all;//过滤类型 type（FAULT ：故障； WARN ：告警； EVENT ：事件(提示)）；
    private String mTypeFilterValue = FilterType.all;//过滤类型值 type（FAULT ：故障； WARN ：告警； EVENT ：事件(提示)）；
@@ -106,10 +108,10 @@
                viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
                viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
                isAlarmDeviceClick = true;
                isRefreshTotalCount=true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
                viewBinding.allClearTv.setVisibility(View.VISIBLE);
                isRefreshTotalCount = true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
                viewBinding.allClearIv.setVisibility(View.VISIBLE);
                loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
            }
        });
@@ -130,10 +132,10 @@
                viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
                viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
                isAlarmDeviceClick = false;
                isRefreshTotalCount=true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
                viewBinding.allClearTv.setVisibility(View.GONE);
                isRefreshTotalCount = true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text14Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text18Style);
                viewBinding.allClearIv.setVisibility(View.GONE);
                loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
            }
        });
@@ -155,7 +157,7 @@
        });

        //清空所有未读按钮
        viewBinding.allClearTv.setOnClickListener(new View.OnClickListener() {
        viewBinding.allClearIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                showLoading();
@@ -261,7 +263,7 @@
     * @param stringList 过滤类型值表
     */
    private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) {
        BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList);
        BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList, textView.getText().toString());
        typeTitleListDialog.show();
        typeTitleListDialog.setOnListener(new BTypeTitleListDialog.OnClickListener() {
            @Override
@@ -287,18 +289,27 @@
                loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
            }
        });
        typeTitleListDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
            @Override
            public void onDismiss(DialogInterface dialog) {
                viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down);
                viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
                viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
            }
        });
    }


    private void initView() {
        if (isAlarmDeviceClick) {
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
        } else {
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
        }

//        viewBinding..topMoreBtn.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
        mMessageAdapter = new MessageAdapter(_mActivity);
        viewBinding.messageRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
        viewBinding.messageRcv.setAdapter(mMessageAdapter);
@@ -401,6 +412,7 @@
                if (isShowLoading) {
                    hideLoading();
                }
                HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
            }
        });

@@ -598,6 +610,7 @@
        map.put(getString(R.string.alarm_all_device_inverter), "INV");
        map.put(getString(R.string.alarm_all_device_bms), "BMS");
        map.put(getString(R.string.alarm_all_device_battery_cell), "BATTERY");
        map.put(getString(R.string.alarm_all_device_load_centre), "LOAD_CENTRE");
        map.put(getString(R.string.alarm_all_grade), "");//设等级全部
        map.put(getString(R.string.alarm_all_grade_malfunction), "FAULT");
        map.put(getString(R.string.alarm_all_grade_warning), "WARN");
@@ -630,6 +643,7 @@
                stringList.add(getString(R.string.alarm_all_device_inverter));
                stringList.add(getString(R.string.alarm_all_device_bms));
                stringList.add(getString(R.string.alarm_all_device_battery_cell));
                stringList.add(getString(R.string.alarm_all_device_load_centre));
            }
            break;
            case FilterType.type: {