Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java

@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.widget;

import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
@@ -13,6 +15,9 @@
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
import com.hdl.photovoltaic.enums.GridType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;

public class DefaultFilteringDialog extends BaseDialog {
@@ -45,7 +50,7 @@
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        //空白处不能取消动画
        setCanceledOnTouchOutside(false);
//        setCanceledOnTouchOutside(true);
        //初始化界面控件
        initView();
        //初始化界面数据
@@ -57,6 +62,12 @@
    }

    private void initEvent() {
        viewBinding.clickRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                dismiss();
            }
        });

        viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -99,11 +110,13 @@
            }
        });

        viewBinding.resetTv.setOnClickListener(new View.OnClickListener() {
        viewBinding.resetRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setBackgroundColor(null, TitleType.string_capacity);
                setSelectedText("");
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                mStateValue = GridType.All;
            }
        });
        viewBinding.text1Tv.setOnClickListener(new View.OnClickListener() {
@@ -169,7 +182,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.allTv.getTag().toString());
                mStateValue = GridType.All;
            }
        });
        viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
@@ -177,7 +190,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.gridConnectedTv.getTag().toString());
                mStateValue = GridType.FULL_GRID;
            }
        });
        viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
@@ -185,7 +198,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.offNetworkTv.getTag().toString());
                mStateValue = GridType.OFFLINE;
            }
        });

@@ -209,8 +222,6 @@
                minValue = min_max[0];
                maxValue = min_max[1];
            }
        } else {
            mStateValue = value;
        }

        viewBinding.minEt.setText(minValue);
@@ -306,6 +317,8 @@

    private void initView() {

        String s = mContext.getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
        viewBinding.capacityTv.setText(s);
        viewBinding.text1Tv.setTag(text1);
        viewBinding.text2Tv.setTag(text2);
        viewBinding.text3Tv.setTag(text3);