Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -2,6 +2,7 @@

import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
@@ -18,6 +19,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.GridType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlThreadLogic;
@@ -49,15 +51,14 @@
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
//        requestWindowFeature(Window.FEATURE_NO_TITLE);
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            window.setGravity(Gravity.BOTTOM);
        }
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());

//        setCanceledOnTouchOutside(false);
        //初始化界面控件
        initView();
        //初始化界面数据
@@ -116,8 +117,8 @@
            public void onClick(View v) {
                setBackgroundColor(null, TitleType.string_capacity);
                setSelectedText("");
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                mStateValue = GridType.All;
                setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                mStateValue = DebugStatus.All;
            }
        });
        viewBinding.text1Tv.setOnClickListener(new View.OnClickListener() {
@@ -177,29 +178,49 @@
                setSelectedText(viewBinding.text8Tv.getTag().toString());
            }
        });

        //全部
        viewBinding.allTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                mStateValue = GridType.All;
                setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                mStateValue = DebugStatus.All;
            }
        });
        viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
        //调试中
        viewBinding.beDebuggingTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
                mStateValue = GridType.FULL_GRID;
                setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
                mStateValue = DebugStatus.Debugging;
            }
        });
        viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
        //调试完成
        viewBinding.debuggingcOmpletedTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
                mStateValue = GridType.OFFLINE;
                setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
                mStateValue = DebugStatus.WAIT_DELIVERED;
            }
        });
        //已交付
        viewBinding.deliveredTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
                mStateValue = DebugStatus.Delivered;
            }
        });
        //授权调试
        viewBinding.authorizationDebuggingTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
                mStateValue = DebugStatus.SECONDARY_DEBUGGIN;
            }
        });

@@ -248,8 +269,10 @@
            viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
        } else {
            viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.beDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.debuggingcOmpletedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.deliveredTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.authorizationDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
        }
        if (textView != null) {
            textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_yes_129));
@@ -292,12 +315,26 @@
                        break;
                }
            }
            if (TextUtils.isEmpty(stateValue)) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
            } else if (stateValue.equals(GridType.FULL_GRID)) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
            } else {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
            switch (stateValue) {
                case DebugStatus.All:
                    setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                    break;
                case DebugStatus.Debugging:
                    setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
                    break;
                case DebugStatus.WAIT_DELIVERED:
                    setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
                    break;
                case DebugStatus.Delivered:
                    setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
                    break;
                case DebugStatus.SECONDARY_DEBUGGIN:
                    setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
                    break;
                default: {
                    setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                    break;
                }
            }
        } catch (Exception ignored) {
        }
@@ -317,11 +354,13 @@
        viewBinding.text7Tv.setTag(text7);
        viewBinding.text8Tv.setTag(text8);

        viewBinding.allTv.setTag(GridType.All);
        viewBinding.gridConnectedTv.setTag(GridType.FULL_GRID);
        viewBinding.offNetworkTv.setTag(GridType.OFFLINE);
        viewBinding.allTv.setTag(DebugStatus.All);
        viewBinding.beDebuggingTv.setTag(DebugStatus.Debugging);
        viewBinding.debuggingcOmpletedTv.setTag(DebugStatus.WAIT_DELIVERED);
        viewBinding.deliveredTv.setTag(DebugStatus.Delivered);
        viewBinding.authorizationDebuggingTv.setTag(DebugStatus.SECONDARY_DEBUGGIN);
        setBackgroundColor(null, TitleType.string_capacity);
        setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
        setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
    }

    public void setOnClickListener(OnClickListener onClickListener) {
@@ -337,7 +376,7 @@

    public enum TitleType {
        string_capacity,//组串容量
        GridConnectedState//并网状态
        debuggingState//调试状态

    }