From 644a68d865a8e26ea558d7638671ee36aee9416c Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Thu, 28 May 2026 17:58:32 +0800
Subject: [PATCH] =?UTF-8?q?time=E5=88=97=E8=A1=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckkj/water/plan/AddWaterPlanActivity.java | 58 +++++--------------
 .../water/plan/WaterConfigFragment_copy.java  | 37 +++++++++++-
 .../water_config_fragment_layout_copy.xml     |  1 +
 3 files changed, 52 insertions(+), 44 deletions(-)

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 fdd0015..ad6d948 100644
--- a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
+++ b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
@@ -115,49 +115,23 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
                 break;
 
             case R.id.tv_bind:
-//                WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0);
-//                if (!configFragment.checkConfigFinish()) {
-//                    ToastUtil.showShort(mContext, "请完成配置");
-//                    return;
-//                }
+                WaterConfigFragment_copy configFragment = (WaterConfigFragment_copy) mFragmentList.get(0);
+                if (!configFragment.isConfigSubmitted()) {
+                    showDialogtext(null, false, false, true,
+                            "提示", "关联设备需要保存排程配置，是否继续？",
+                            getString(R.string.cancel_text), "继续", new BaseFragment.OnDialogClick() {
+                                @Override
+                                public void onCancelClick() {
+                                }
+
+                                @Override
+                                public void onConfirmClick() {
+                                    configFragment.commitConfig();
+                                }
+                            });
+                    return;
+                }
 
-                // 编辑模式下，检查配置是否有变化
-//                if (mIsEditMode) {
-//                    if (configFragment.isConfigChanged()) {
-//                        showDialogtext(mContext.getResources().getDrawable(R.mipmap.img_location), false, false, true,
-//                                "提示", "配置已修改，是否保存？",
-//                                "取消", "保存", new BaseFragment.OnDialogClick() {
-//                                    @Override
-//                                    public void onCancelClick() {
-//                                    }
-//
-//                                    @Override
-//                                    public void onConfirmClick() {
-//                                        configFragment.commitConfig();
-//                                    }
-//                                });
-//                    } else {
-//                        selectTabBind(mEditEntity);
-//                    }
-//                } else {
-//                    // 新增模式，检查配置是否已保存
-//                    if (!configFragment.isConfigSave || configFragment.isConfigChanged()) {
-//                        showDialogtext(mContext.getResources().getDrawable(R.mipmap.img_location), false, false, true,
-//                                "提示", "关联设备需要保存排程配置，是否继续？",
-//                                "取消", "继续", new BaseFragment.OnDialogClick() {
-//                                    @Override
-//                                    public void onCancelClick() {
-//                                    }
-//
-//                                    @Override
-//                                    public void onConfirmClick() {
-//                                        configFragment.commitConfig();
-//                                    }
-//                                });
-//                    } else {
-//                        selectTabBind(mNewAddEntity);
-//                    }
-//                }
                 viewBinding.tvConfig.setSelected(false);
                 viewBinding.tvBind.setSelected(true);
                 viewBinding.viewpage.setCurrentItem(1);
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 f9faf70..5d24d6b 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
@@ -49,6 +49,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
     private WaterPlanWeekAdapter_copy mWeekAdapter;
     private WaterPlanTimeDataAdapter mTimeAdapter;
     private RecyclerView.ItemDecoration itemDecoration;
+    private boolean isConfigSubmitted = false;
 
 
     @Override
@@ -123,17 +124,49 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
         switch (v.getId()){
 
             case R.id.img_add:
+                isConfigSubmitted = false;
                 int selPos = mWeekAdapter.getmPos();
-                WaterPlanWeekEntity.TimeDataBean timeData = new WaterPlanWeekEntity.TimeDataBean();
-                weekList.get(selPos).getTimeData().add(timeData);
+                WaterPlanWeekEntity.TimeDataBean timeDataAdd = new WaterPlanWeekEntity.TimeDataBean();
+                weekList.get(selPos).getTimeData().add(timeDataAdd);
                 mTimeAdapter.notifyItemInserted(weekList.get(selPos).getTimeData().size() - 1);
                 break;
 
             case R.id.tv_commit:
+                if(TextUtils.isEmpty(viewBinding.editPlanName.getText().toString())){
+                    ToastUtil.showShort(mContext,getString(R.string.plan_name_text_empty_hint));
+                    return;
+                }
+                // 检查七天的所有时间配置是否全部为空
+                boolean allTimeEmpty = true;
+                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) {
+                                allTimeEmpty = false;
+                                break;
+                            }
+                        }
+                    }
+                    if (!allTimeEmpty) break;
+                }
+                if (allTimeEmpty) {
+                    ToastUtil.showShort(mContext, "请至少配置一天的时间");
+                    return;
+                }
+                //TODO 这里需要校验一下TimeData中的时间，设定的时间，开始时间+浇水时长，不能与当天其他时间设定的时间冲突，或者重合。需要避开。
+                isConfigSubmitted = true;
                 break;
         }
     }
 
+    public boolean isConfigSubmitted() {
+        return isConfigSubmitted;
+    }
+
+    public void commitConfig() {
+    }
+
     /**
      * 选择开始时间
      * @param position
diff --git a/app/src/main/res/layout/water_config_fragment_layout_copy.xml b/app/src/main/res/layout/water_config_fragment_layout_copy.xml
index 2d3d92b..ce39584 100644
--- a/app/src/main/res/layout/water_config_fragment_layout_copy.xml
+++ b/app/src/main/res/layout/water_config_fragment_layout_copy.xml
@@ -33,6 +33,7 @@
                 android:layout_marginVertical="@dimen/dp_13"/>
 
             <EditText
+                android:id="@+id/edit_plan_name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"