排程重做

app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java

@@ -129,7 +129,6 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
                                 "取消", "保存", new BaseFragment.OnDialogClick() {
                                     @Override
                                     public void onCancelClick() {
-                                        selectTabBind(mEditEntity);
                                     }
 
                                     @Override
@@ -156,7 +155,7 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
                                     }
                                 });
                     } else {
-                        selectTabBind(null);
+                        selectTabBind(mNewAddEntity);
                     }
                 }
                 break;
@@ -166,6 +165,13 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
     }
 
     private void selectTabBind(WaterPlanWeekEntity entity) {
+        if (entity == null) {
+            entity = mIsEditMode ? mEditEntity : mNewAddEntity;
+        }
+        if (entity == null) {
+            ToastUtil.showShort(mContext, "请先保存排程");
+            return;
+        }
         viewBinding.tvConfig.setSelected(false);
         viewBinding.tvBind.setSelected(true);
         viewBinding.viewpage.setCurrentItem(1);
@@ -176,6 +182,7 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
     }
 
     public void onConfigSaved(WaterPlanWeekEntity entity) {
+        mNewAddEntity = entity;
         selectTabBind(entity);
     }