From 89df3119f8b02639f3bf69ac55171a32b6f73928 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Sat, 30 May 2026 09:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=20=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckkj/water/plan/AddWaterPlanActivity.java | 12 ++++++++
 .../water/plan/PlanBoundDeviceFragment.java   |  7 +++++
 .../water/plan/WaterConfigFragment_copy.java  | 29 +++++++++++++++++++
 .../res/drawable/shape_add_water_tab_bg.xml   |  6 ++++
 app/src/main/res/drawable/tab_selector_bg.xml |  8 +----
 .../main/res/drawable/tab_selector_bg2.xml    |  7 -----
 .../main/res/layout/add_water_plan_layout.xml |  3 +-
 7 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_add_water_tab_bg.xml

diff --git a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
index cbfef7f..e31ae36 100644
--- a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
+++ b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
@@ -4,6 +4,7 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.fragment.app.Fragment;
@@ -158,6 +159,17 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
                 }
 
                 if (!configFragment.isConfigSubmitted()) {
+                    // 校验新增排程的配置
+                    if (!mIsEditMode) {
+                        if (TextUtils.isEmpty(configFragment.getPlanName())) {
+                            ToastUtil.showShort(mContext, getString(R.string.plan_name_text_empty_hint));
+                            return;
+                        }
+                        if (!configFragment.hasTimeConfig()) {
+                            ToastUtil.showShort(mContext, "请至少配置一天的时间");
+                            return;
+                        }
+                    }
                     showDialogtext(null, false, false, true,
                             "提示", "关联设备需要保存排程配置，是否继续？",
                             getString(R.string.cancel_text), "继续", new BaseFragment.OnDialogClick() {
diff --git a/app/src/main/java/com/ckkj/water/plan/PlanBoundDeviceFragment.java b/app/src/main/java/com/ckkj/water/plan/PlanBoundDeviceFragment.java
index 295af8c..d66833a 100644
--- a/app/src/main/java/com/ckkj/water/plan/PlanBoundDeviceFragment.java
+++ b/app/src/main/java/com/ckkj/water/plan/PlanBoundDeviceFragment.java
@@ -167,6 +167,13 @@ public class PlanBoundDeviceFragment extends BaseFragment<PlanBoundDeviceLayoutB
         ToastUtil.showShort(mContext, "解绑成功");
         mAdapter.notifyItemRemoved(position);
         mEditEntity.getDeviceIds().remove(position);
+        if (mAdapter.getItemCount() != 0) {
+            viewBinding.relNoresult.setVisibility(View.GONE);
+            viewBinding.linearContent.setVisibility(View.VISIBLE);
+        } else {
+            viewBinding.relNoresult.setVisibility(View.VISIBLE);
+            viewBinding.linearContent.setVisibility(View.GONE);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java
index 2cce514..459eeed 100644
--- a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java
+++ b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java
@@ -189,6 +189,35 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
         return isConfigSubmitted;
     }
 
+    /**
+     * 获取当前排程名称
+     * @return 排程名称
+     */
+    public String getPlanName() {
+        if (mLocalEntity != null) {
+            return mLocalEntity.getName();
+        }
+        return "";
+    }
+
+    /**
+     * 检查是否至少配置了一天的时间
+     * @return true表示有时间配置，false表示没有配置任何时间
+     */
+    public boolean hasTimeConfig() {
+        for (WaterPlanWeekEntity.DetailsBean dayBean : weekList) {
+            List<WaterPlanWeekEntity.TimeDataBean> timeDataList = dayBean.getTimeData();
+            if (timeDataList != null && !timeDataList.isEmpty()) {
+                for (WaterPlanWeekEntity.TimeDataBean timeData : timeDataList) {
+                    if (!TextUtils.isEmpty(timeData.getStartTime()) && timeData.getDurationMin() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * 校验并保存配置（供外部调用）
      * @return true表示校验通过并已提交保存，false表示校验失败
diff --git a/app/src/main/res/drawable/shape_add_water_tab_bg.xml b/app/src/main/res/drawable/shape_add_water_tab_bg.xml
new file mode 100644
index 0000000..823eb2a
--- /dev/null
+++ b/app/src/main/res/drawable/shape_add_water_tab_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <stroke android:color="@color/color_zhu" android:width="@dimen/dp_1"/>
+    <corners android:radius="@dimen/dp_4"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_selector_bg.xml b/app/src/main/res/drawable/tab_selector_bg.xml
index d946c3b..cb8aaf9 100644
--- a/app/src/main/res/drawable/tab_selector_bg.xml
+++ b/app/src/main/res/drawable/tab_selector_bg.xml
@@ -6,11 +6,5 @@
             <corners android:topLeftRadius="@dimen/dp_4" android:bottomLeftRadius="@dimen/dp_4" />
         </shape>
     </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <stroke android:color="@color/color_zhu" android:width="@dimen/dp_1"/>
-            <corners android:topLeftRadius="@dimen/dp_4" android:bottomLeftRadius="@dimen/dp_4" />
-        </shape>
-    </item>
+
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_selector_bg2.xml b/app/src/main/res/drawable/tab_selector_bg2.xml
index 7cd4287..572e58a 100644
--- a/app/src/main/res/drawable/tab_selector_bg2.xml
+++ b/app/src/main/res/drawable/tab_selector_bg2.xml
@@ -6,11 +6,4 @@
             <corners android:topRightRadius="@dimen/dp_4" android:bottomRightRadius="@dimen/dp_4" />
         </shape>
     </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <stroke android:color="@color/color_zhu" android:width="@dimen/dp_1"/>
-            <corners android:bottomRightRadius="@dimen/dp_4" android:topRightRadius="@dimen/dp_4" />
-        </shape>
-    </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_water_plan_layout.xml b/app/src/main/res/layout/add_water_plan_layout.xml
index 322a1e8..fa46461 100644
--- a/app/src/main/res/layout/add_water_plan_layout.xml
+++ b/app/src/main/res/layout/add_water_plan_layout.xml
@@ -16,7 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_40"
         android:orientation="horizontal"
-        android:layout_marginHorizontal="@dimen/dp_20">
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:background="@drawable/shape_add_water_tab_bg">
         <TextView
             android:id="@+id/tv_config"
             android:layout_width="0dp"