更新后新增排程提交

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

@@ -116,6 +116,25 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
 
             case R.id.tv_bind:
                 WaterConfigFragment_copy configFragment = (WaterConfigFragment_copy) mFragmentList.get(0);
+
+                // 检查是否有未保存的数据变更
+                if (configFragment.hasDataChanged()) {
+                    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 (!configFragment.isConfigSubmitted()) {
                     showDialogtext(null, false, false, true,
                             "提示", "关联设备需要保存排程配置，是否继续？",
@@ -132,9 +151,10 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
                     return;
                 }
 
-                viewBinding.tvConfig.setSelected(false);
-                viewBinding.tvBind.setSelected(true);
-                viewBinding.viewpage.setCurrentItem(1);
+                proceedToBindDevice();
+                break;
+
+            default:
                 break;
 
 
@@ -158,6 +178,18 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
         bindDeviceFragment.setPlanEntity(entity);
     }
 
+    /**
+     * 切换到绑定设备页面
+     */
+    private void proceedToBindDevice() {
+        WaterConfigFragment_copy configFragment = (WaterConfigFragment_copy) mFragmentList.get(0);
+        WaterPlanWeekEntity entity = mIsEditMode ? mEditEntity : mNewAddEntity;
+        if (entity == null) {
+            entity = configFragment.getRemoteEntity();
+        }
+        selectTabBind(entity);
+    }
+
     public void onConfigSaved(WaterPlanWeekEntity entity) {
         mNewAddEntity = entity;
         selectTabBind(entity);