From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 22 八月 2024 13:43:47 +0800 Subject: [PATCH] 2024年08月22日13:43:45 --- app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 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 3ae9b1c..2b997a1 100644 --- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java +++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java @@ -1,9 +1,15 @@ 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; +import android.view.Gravity; import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; @@ -13,6 +19,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 { @@ -42,10 +51,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 +69,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 +117,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 +189,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 +197,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 +205,7 @@ @Override public void onClick(View v) { setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState); - setSelectedText(viewBinding.offNetworkTv.getTag().toString()); + mStateValue = GridType.OFFLINE; } }); @@ -209,8 +229,6 @@ minValue = min_max[0]; maxValue = min_max[1]; } - } else { - mStateValue = value; } viewBinding.minEt.setText(minValue); @@ -306,6 +324,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