time列表设置时间

This commit is contained in:
fengjignqi
2026-05-28 17:58:32 +08:00
parent 693acda192
commit 644a68d865
3 changed files with 52 additions and 44 deletions

View File

@@ -115,49 +115,23 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
break; break;
case R.id.tv_bind: case R.id.tv_bind:
// WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0); WaterConfigFragment_copy configFragment = (WaterConfigFragment_copy) mFragmentList.get(0);
// if (!configFragment.checkConfigFinish()) { if (!configFragment.isConfigSubmitted()) {
// ToastUtil.showShort(mContext, "请完成配置"); showDialogtext(null, false, false, true,
// return; "提示", "关联设备需要保存排程配置,是否继续?",
// } 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.tvConfig.setSelected(false);
viewBinding.tvBind.setSelected(true); viewBinding.tvBind.setSelected(true);
viewBinding.viewpage.setCurrentItem(1); viewBinding.viewpage.setCurrentItem(1);

View File

@@ -49,6 +49,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
private WaterPlanWeekAdapter_copy mWeekAdapter; private WaterPlanWeekAdapter_copy mWeekAdapter;
private WaterPlanTimeDataAdapter mTimeAdapter; private WaterPlanTimeDataAdapter mTimeAdapter;
private RecyclerView.ItemDecoration itemDecoration; private RecyclerView.ItemDecoration itemDecoration;
private boolean isConfigSubmitted = false;
@Override @Override
@@ -123,16 +124,48 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
switch (v.getId()){ switch (v.getId()){
case R.id.img_add: case R.id.img_add:
isConfigSubmitted = false;
int selPos = mWeekAdapter.getmPos(); int selPos = mWeekAdapter.getmPos();
WaterPlanWeekEntity.TimeDataBean timeData = new WaterPlanWeekEntity.TimeDataBean(); WaterPlanWeekEntity.TimeDataBean timeDataAdd = new WaterPlanWeekEntity.TimeDataBean();
weekList.get(selPos).getTimeData().add(timeData); weekList.get(selPos).getTimeData().add(timeDataAdd);
mTimeAdapter.notifyItemInserted(weekList.get(selPos).getTimeData().size() - 1); mTimeAdapter.notifyItemInserted(weekList.get(selPos).getTimeData().size() - 1);
break; break;
case R.id.tv_commit: 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; break;
} }
} }
}
if (!allTimeEmpty) break;
}
if (allTimeEmpty) {
ToastUtil.showShort(mContext, "请至少配置一天的时间");
return;
}
//TODO 这里需要校验一下TimeData中的时间设定的时间开始时间+浇水时长,不能与当天其他时间设定的时间冲突,或者重合。需要避开。
isConfigSubmitted = true;
break;
}
}
public boolean isConfigSubmitted() {
return isConfigSubmitted;
}
public void commitConfig() {
}
/** /**
* 选择开始时间 * 选择开始时间

View File

@@ -33,6 +33,7 @@
android:layout_marginVertical="@dimen/dp_13"/> android:layout_marginVertical="@dimen/dp_13"/>
<EditText <EditText
android:id="@+id/edit_plan_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"