From 23d38b1e7374c20698702b6ab3feb1e92e82c4d3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 04 十二月 2024 19:22:17 +0800
Subject: [PATCH] 2024年12月04日19:22:16

---
 app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java |   59 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index 75f3d09..0a6f62a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -3,7 +3,10 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -13,6 +16,7 @@
 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.HdlThreadLogic;
 
 public class DefaultFilteringDialog extends BaseDialog {
@@ -42,10 +46,13 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        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();
         //鍒濆鍖栫晫闈㈡暟鎹�
@@ -57,6 +64,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 +112,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() {
@@ -224,33 +239,21 @@
      */
     private void setBackgroundColor(TextView textView, TitleType titleType) {
         if (titleType == TitleType.string_capacity) {
-            viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
+            viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+            viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
         } else {
-            viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_E6000000));
-            viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
-            viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_E6000000));
+            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));
         }
         if (textView != null) {
-            textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.selected_38c494));
-            textView.setTextColor(mContext.getColor(R.color.text_FFFFFFFF));
+            textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_yes_129));
         }
 
     }
@@ -304,6 +307,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);

--
Gitblit v1.8.0