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-06-06 18:01:18 +08:00
parent bafd193a96
commit e040be11c3
16 changed files with 129 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,11 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
// 检查是否有未保存的数据变更
if (configFragment.hasDataChanged()) {
showDialogtext(null, false, false, true,
"提示", "数据已发生变更，是否保存？",
getString(R.string.cancel_text), "保存", new BaseFragment.OnDialogClick() {
getString(R.string.tip_text),
getString(R.string.data_changed_save_confirm),
getString(R.string.cancel_text),
getString(R.string.button_save),
new BaseFragment.OnDialogClick() {
@Override
public void onCancelClick() {
}
@@ -165,13 +168,15 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
return;
}
if (!configFragment.hasTimeConfig()) {
ToastUtil.showShort(mContext, "请至少配置一天的时间");
ToastUtil.showShort(mContext, getString(R.string.schedule_select_at_least_one_day));
return;
}
}
showDialogtext(null, false, false, true,
"提示", "关联设备需要保存排程配置，是否继续？",
getString(R.string.cancel_text), "继续", new BaseFragment.OnDialogClick() {
getString(R.string.tip_text),
getString(R.string.save_schedule_before_bind_device),
getString(R.string.cancel_text),
getString(R.string.btn_continue), new BaseFragment.OnDialogClick() {
@Override
public void onCancelClick() {
}
@@ -199,7 +204,7 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
entity = mIsEditMode ? mEditEntity : mNewAddEntity;
}
if (entity == null) {
ToastUtil.showShort(mContext, "请先保存排程");
ToastUtil.showShort(mContext, getString(R.string.please_save_schedule_first));
return;
}
viewBinding.tvConfig.setSelected(false);

2
app/src/main/java/com/ckkj/water/plan/PlanDetailActivity.java
View File

@@ -184,7 +184,7 @@ public class PlanDetailActivity extends BaseActivity<WaterPlanDetailLayoutBindin
if(!TextUtils.isEmpty(timeBean.getStartTime())
&& timeBean.getDurationMin() != 0){
hasValidTime = true;
bean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1));
bean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1,mContext));
break;
}
}

4
app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
View File

@@ -53,7 +53,7 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutB
WaterPlanWeekEntity.DetailsBean bean = new WaterPlanWeekEntity.DetailsBean();
bean.setWeekday(i + 1);
bean.setStatus("0");
bean.setWeekName(ZYTimeUtils.getWeekName(i));
bean.setWeekName(ZYTimeUtils.getWeekName(i,mContext));
list.add(bean);
}
mConfigEntity.setDetails(list);
@@ -105,7 +105,7 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutB
WaterPlanWeekEntity.DetailsBean newBean = new WaterPlanWeekEntity.DetailsBean();
newBean.setId(bean.getId());
newBean.setWeekday(bean.getWeekday());
newBean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1));
newBean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1,mContext));
newBean.setStatus(bean.getStatus());
newBean.setStartTime(ZYTimeUtils.formatHHmm(bean.getStartTime()));
newBean.setDurationMin(bean.getDurationMin());

14
app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java
View File

@@ -78,7 +78,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
bean.setTimeData(timeDataList);
bean.setWeekday(i + 1);
bean.setStatus("1");
bean.setWeekName(ZYTimeUtils.getWeekName(i));
bean.setWeekName(ZYTimeUtils.getWeekName(i,mContext));
bean.setTriggerType("0");
list.add(bean);
}
@@ -293,7 +293,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
newBean.setTimeData(timeDataList);
newBean.setId(bean.getId());
newBean.setWeekday(bean.getWeekday());
newBean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1));
newBean.setWeekName(ZYTimeUtils.getWeekName(bean.getWeekday() - 1,mContext));
newBean.setStatus(bean.getStatus());
detailsList.add(newBean);
}
@@ -328,7 +328,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
if (!allTimeEmpty) break;
}
if (allTimeEmpty) {
ToastUtil.showShort(mContext, "请至少配置一天的时间");
ToastUtil.showShort(mContext, getString(R.string.schedule_select_at_least_one_day));
return false;
}
// 校验每一天内的时间是否有冲突
@@ -503,7 +503,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
// 不冲突：p1.end <= p2.start 或 p2.end <= p1.start
if (!(p1[1] <= p2[0] || p2[1] <= p1[0])) {
String dayName = dayBean.getWeekName();
return dayName + "的时间配置存在冲突，请调整";
return dayName + getString(R.string.schedule_time_conflict);
}
}
}
@@ -582,7 +582,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
public void onCreateMenu(SwipeMenu leftMenu, SwipeMenu rightMenu, int position) {
SwipeMenuItem deleteItem = new SwipeMenuItem(mContext);
deleteItem.setBackground(mContext.getResources().getDrawable(R.drawable.shape_item_delete_bg));
deleteItem.setText("删除");
deleteItem.setText(getString(R.string.button_delete));
deleteItem.setTextColor(mContext.getResources().getColor(R.color.white));
deleteItem.setHeight(ViewGroup.LayoutParams.MATCH_PARENT);
deleteItem.setWidth((int) mContext.getResources().getDimension(R.dimen.dp_90));
@@ -619,7 +619,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
*/
@Override
public void saveConfigSuccess(WaterPlanWeekEntity entity) {
ToastUtil.showShort(mContext, "排程新增成功");
ToastUtil.showShort(mContext, getString(R.string.schedule_add_success));
isConfigSubmitted = true;
// 把接口返回的 ID 设置到 mConfigEntity，便于后续更新操作
mLocalEntity.setId(entity.getId());
@@ -644,7 +644,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
*/
@Override
public void updateConfigSuccess(WaterPlanWeekEntity entity) {
ToastUtil.showShort(mContext, "排程更新成功");
ToastUtil.showShort(mContext, getString(R.string.schedule_update_success));
mRemoteEntity = entity;
}