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

3
app/src/main/java/com/ckkj/water/base/BaseActivity.java
View File

@@ -1102,7 +1102,8 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
false, false, true,
title,
content,
"不允许", "允许",
getString(R.string.button_deny),
getString(R.string.button_allow),
new BaseFragment.OnDialogClick() {
@Override
public void onCancelClick() {

3
app/src/main/java/com/ckkj/water/base/BaseFragment.java
View File

@@ -118,7 +118,8 @@ public abstract class BaseFragment<T extends ViewBinding,P extends IPresenter> e
false, false,
title,
content,
"不允许", "允许",
getString(R.string.button_deny),
getString(R.string.button_allow),
new BaseFragment.OnDialogClick() {
@Override
public void onCancelClick() {

4
app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
View File

@@ -163,10 +163,10 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
case R.id.tv_confirm:
if(mCustomDuration == 0 && mAdapter.getmSelPostion() == -1){
ToastUtil.showShort(mContext,"请选择浇水时长");
ToastUtil.showShort(mContext,getString(R.string.select_watering_duration));
return;
}
showCenterTipDialog(R.mipmap.icon_dialog_success,"开始浇水");//
showCenterTipDialog(R.mipmap.icon_dialog_success,getString(R.string.start_watering));//
String status = mDeviceEntity.getStatus();
if(status.equals("1")){
status = "0";

6
app/src/main/java/com/ckkj/water/index/IndexFragment.java
View File

@@ -102,8 +102,10 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
//检测有无相机权限
String readPermission = Manifest.permission.CAMERA;
if(!hasRecordPermission(readPermission)){
getPermissionRequst(readPermission,"权限申请",
"智能浇水需要您的授权访问相机，并使用扫一扫",REQUEST_EVENT_CODE_10001);
getPermissionRequst(readPermission,
getString(R.string.permission_request_title),
getString(R.string.camera_permission_scan_desc),
REQUEST_EVENT_CODE_10001);
}else{
scanQrcode();
}

2
app/src/main/java/com/ckkj/water/main/activity/MainActivity.java
View File

@@ -336,7 +336,7 @@ public class MainActivity extends BaseActivity<MainActivityLayoutBinding, MainPr
private void exitApp() {
if ((System.currentTimeMillis() - exitTime) > 2000) {
ToastUtil.showShort(getApplicationContext(), "再按一次退出");
ToastUtil.showShort(getApplicationContext(), getString(R.string.press_again_to_exit));
exitTime = System.currentTimeMillis();
} else {
//结束所有activity

6
app/src/main/java/com/ckkj/water/permission/PermissionActivity.java
View File

@@ -103,8 +103,10 @@ public class PermissionActivity extends BaseActivity<PermissionLayoutBinding, Ma
};
if (!hasRecordPermission(readPermission)) {
// 没有权限，只在ACTION_DOWN时去申请
getMorePermissionRequst(readPermission,"蓝牙扫描权限申请",
"智溉管家需要您的授权，获取蓝牙权限添加设备",REQUEST_EVENT_CODE_10003);
getMorePermissionRequst(readPermission,
getString(R.string.bluetooth_permission_title),
getString(R.string.bluetooth_permission_desc),
REQUEST_EVENT_CODE_10003);
return false;
}
} else {

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;
}

17
app/src/main/java/com/ckkj/water/utils/time/ZYTimeUtils.java
View File

@@ -4,6 +4,9 @@ package com.ckkj.water.utils.time;
import android.content.Context;
import android.text.TextUtils;
import android.widget.TextView;
import com.ckkj.water.R;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -1062,16 +1065,24 @@ public class ZYTimeUtils {
}
}
private static final String[] WEEK_NAMES = {"周一", "周二", "周三", "周四", "周五", "周六", "周日"};
/**
* 根据星期索引获取星期名称
* @param weekday 星期索引，0=周一，1=周二，...，6=周日
* @return 对应的星期名称
*/
public static String getWeekName(int weekday) {
public static String getWeekName(int weekday,Context context) {
String[] weekNames = {
context.getString(R.string.week_monday),
context.getString(R.string.week_tuesday),
context.getString(R.string.week_wednesday),
context.getString(R.string.week_thursday),
context.getString(R.string.week_friday),
context.getString(R.string.week_saturday),
context.getString(R.string.week_sunday)
};
if (weekday >= 0 && weekday < 7) {
return WEEK_NAMES[weekday];
return weekNames[weekday];
}
return "";
}