From 5e920037f55669f7f9d1263f54a071c219089300 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Wed, 24 Jun 2026 10:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ckkj/water/custom/CustomTypeFilterPopupView.java   | 4 ----
 .../java/com/ckkj/water/history/TabHistoryFragment.java    | 7 ++++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/custom/CustomTypeFilterPopupView.java b/app/src/main/java/com/ckkj/water/custom/CustomTypeFilterPopupView.java
index 458dd14..c560e61 100644
--- a/app/src/main/java/com/ckkj/water/custom/CustomTypeFilterPopupView.java
+++ b/app/src/main/java/com/ckkj/water/custom/CustomTypeFilterPopupView.java
@@ -110,10 +110,6 @@ public class CustomTypeFilterPopupView extends PartShadowPopupView implements Vi
                 break;
 
             case R.id.tv_finish:
-                if(!mSelManual && !mSelAuto){
-                    ToastUtil.showShort(mContext,mContext.getString(R.string.history_filter_type_toast));
-                    return;
-                }
                 if(listener != null){
                     listener.callBack(mSelManual,mSelAuto);
                     this.dismiss();
diff --git a/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java b/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java
index 4cc3551..e917369 100644
--- a/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java
+++ b/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java
@@ -180,11 +180,12 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
                         .asCustom(new CustomTypeFilterPopupView(getContext(), new CustomTypeFilterPopupView.OnClickListener() {
                             @Override
                             public void callBack(boolean mSelManual, boolean mSelAuto) {
-                                if(mSelManual){
+                                if (mSelManual) {
                                     mFilterType = 1;
-                                }
-                                if(mSelAuto){
+                                } else if (mSelAuto) {
                                     mFilterType = 0;
+                                } else {
+                                    mFilterType = -1;
                                 }
                                 getWaterHistoryList();
                             }