From 2b805d413e924bc0a8e80e1280208d9af8d93cb1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:07 +0800
Subject: [PATCH] 2024年05月30日21:11:54
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..a92d567 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/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;
@@ -45,7 +47,7 @@
viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
- setCanceledOnTouchOutside(false);
+// setCanceledOnTouchOutside(true);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -57,6 +59,12 @@
}
private void initEvent() {
+ viewBinding.clickRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -169,7 +177,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 +185,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 +193,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.offNetworkTv.getTag().toString());
+ mStateValue = GridType.OFFLINE;
}
});
@@ -209,8 +217,6 @@
minValue = min_max[0];
maxValue = min_max[1];
}
- } else {
- mStateValue = value;
}
viewBinding.minEt.setText(minValue);
--
Gitblit v1.8.0