fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排程重做

Browse Source
This commit is contained in:
fengjignqi
2026-05-28 14:56:39 +08:00
parent 401d1892bb
commit 79e66a20ef
9 changed files with 149 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
View File

@@ -71,7 +71,7 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
viewBinding.includedTitle.tvTitle.setText(R.string.add_water_plan_title);
}
mFragmentList.add(new WaterConfigFragment());
mFragmentList.add(new WaterConfigFragment_copy());
mFragmentList.add(new BindDeviceFragment());
ViewPagerAdapter adapter = new ViewPagerAdapter(mContext, mFragmentList);
viewBinding.viewpage.setAdapter(adapter);
@@ -84,12 +84,12 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
initListener();
// 编辑模式下，延迟传递数据给 WaterConfigFragment，等 viewBinding 初始化完成后调用
if (mIsEditMode && mEditEntity != null) {
viewBinding.viewpage.post(() -> {
WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0);
configFragment.setEditEntity(mEditEntity);
});
}
// if (mIsEditMode && mEditEntity != null) {
// viewBinding.viewpage.post(() -> {
// WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0);
// configFragment.setEditEntity(mEditEntity);
// });
// }
}
private void initListener() {
@@ -115,49 +115,52 @@ 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 configFragment = (WaterConfigFragment) mFragmentList.get(0);
// if (!configFragment.checkConfigFinish()) {
// ToastUtil.showShort(mContext, "请完成配置");
// 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);
}
}
// 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);
break;