From e040be11c3be3ea111c577b4f78d10be457b4a08 Mon Sep 17 00:00:00 2001 From: fengjignqi <15192412330@163.com> Date: Sat, 6 Jun 2026 18:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ckkj/water/base/BaseActivity.java | 3 +- .../com/ckkj/water/base/BaseFragment.java | 3 +- .../water/device/DeviceControlActivity.java | 4 +- .../com/ckkj/water/index/IndexFragment.java | 6 ++- .../water/main/activity/MainActivity.java | 2 +- .../water/permission/PermissionActivity.java | 6 ++- .../ckkj/water/plan/AddWaterPlanActivity.java | 17 +++++--- .../ckkj/water/plan/PlanDetailActivity.java | 2 +- .../ckkj/water/plan/WaterConfigFragment.java | 4 +- .../water/plan/WaterConfigFragment_copy.java | 14 +++--- .../ckkj/water/utils/time/ZYTimeUtils.java | 17 ++++++-- .../res/layout/app_theme_change_layout.xml | 4 +- .../main/res/layout/index_fragment_layout.xml | 2 +- .../main/res/layout/mine_fragment_layout.xml | 6 +-- app/src/main/res/values-en/strings.xml | 37 ++++++++++++++++ app/src/main/res/values/strings.xml | 43 ++++++++++++++++--- 16 files changed, 129 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/ckkj/water/base/BaseActivity.java b/app/src/main/java/com/ckkj/water/base/BaseActivity.java index 4384bbc..93d0366 100644 --- a/app/src/main/java/com/ckkj/water/base/BaseActivity.java +++ b/app/src/main/java/com/ckkj/water/base/BaseActivity.java @@ -1102,7 +1102,8 @@ public abstract class BaseActivity false, false, true, title, content, - "不允许", "允许", + getString(R.string.button_deny), + getString(R.string.button_allow), new BaseFragment.OnDialogClick() { @Override public void onCancelClick() { diff --git a/app/src/main/java/com/ckkj/water/base/BaseFragment.java b/app/src/main/java/com/ckkj/water/base/BaseFragment.java index c1db223..36a1f33 100644 --- a/app/src/main/java/com/ckkj/water/base/BaseFragment.java +++ b/app/src/main/java/com/ckkj/water/base/BaseFragment.java @@ -118,7 +118,8 @@ public abstract class BaseFragment e false, false, title, content, - "不允许", "允许", + getString(R.string.button_deny), + getString(R.string.button_allow), new BaseFragment.OnDialogClick() { @Override public void onCancelClick() { diff --git a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java index 8e7bd72..27ebd65 100644 --- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java +++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java @@ -163,10 +163,10 @@ public class DeviceControlActivity extends BaseActivity 2000) { - ToastUtil.showShort(getApplicationContext(), "再按一次退出"); + ToastUtil.showShort(getApplicationContext(), getString(R.string.press_again_to_exit)); exitTime = System.currentTimeMillis(); } else { //结束所有activity diff --git a/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java b/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java index 7dad5eb..03130a6 100644 --- a/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java +++ b/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java @@ -103,8 +103,10 @@ public class PermissionActivity extends BaseActivity= 0 && weekday < 7) { - return WEEK_NAMES[weekday]; + return weekNames[weekday]; } return ""; } diff --git a/app/src/main/res/layout/app_theme_change_layout.xml b/app/src/main/res/layout/app_theme_change_layout.xml index 0a25ab2..51fcd8d 100644 --- a/app/src/main/res/layout/app_theme_change_layout.xml +++ b/app/src/main/res/layout/app_theme_change_layout.xml @@ -51,7 +51,7 @@ android:layout_marginLeft="@dimen/dp_5" android:textSize="16sp" android:textColor="@color/color_222222" - android:text="浅色" + android:text="@string/theme_light" android:textStyle="bold"/> @@ -89,7 +89,7 @@ android:layout_marginLeft="@dimen/dp_5" android:textSize="16sp" android:textColor="@color/color_222222" - android:text="深色" + android:text="@string/theme_dark" android:textStyle="bold"/> diff --git a/app/src/main/res/layout/index_fragment_layout.xml b/app/src/main/res/layout/index_fragment_layout.xml index d89f4ab..3ca9d4a 100644 --- a/app/src/main/res/layout/index_fragment_layout.xml +++ b/app/src/main/res/layout/index_fragment_layout.xml @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_15" android:layout_marginTop="@dimen/dp_10" - android:text="设备" + android:text="@string/device_setting_info" android:textColor="@color/color_333333" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/mine_fragment_layout.xml b/app/src/main/res/layout/mine_fragment_layout.xml index a762846..20f9b0c 100644 --- a/app/src/main/res/layout/mine_fragment_layout.xml +++ b/app/src/main/res/layout/mine_fragment_layout.xml @@ -91,7 +91,7 @@ android:textStyle="bold" android:textSize="16sp" android:textColor="@color/textPrimaryColor" - android:text="背景主题"/> + android:text="@string/theme_title"/> + android:text="@string/language_selection"/> + android:text="@string/password_management"/> Firmware Version Running Idle + Select watering duration + Start Watering Enter schedule name @@ -171,6 +173,41 @@ User Agreement Privacy Policy + + Permission Request + + + Smart Irrigation requires access to your camera to scan QR codes and add devices + + Cancel + Allow + + Bluetooth Permission + + + Smart Irrigation requires Bluetooth access to scan and add devices + + Mon + Tue + Wed + Thu + Fri + Sat + Sun + Schedule conflict detected. Please adjust. + Select at least one day + The schedule must be saved before linking a device. Continue? + Save the schedule first + You have unsaved changes. Save before leaving? + Schedule created + Schedule updated + Theme + Language + Password Management + Light + Dark + Press again to exit + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0aed5e..1441917 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,6 +89,8 @@ 固件版本 工作中 待机中 + 请选择浇水时长 + 开始浇水 @@ -148,13 +150,6 @@ - - 我已阅读并同意智能浇灌《用户协议》《隐私政策》 - 《用户协议》 - 《隐私政策》 - - - 个人中心 @@ -168,6 +163,40 @@ 退出当前账号 + + 我已阅读并同意智能浇灌《用户协议》《隐私政策》 + 《用户协议》 + 《隐私政策》 + + 权限申请 + 智能浇水需要访问您的相机,用于扫描二维码添加设备 + 不允许 + 允许 + + 蓝牙权限申请 + 智溉管家需要访问蓝牙,以扫描并添加设备 + 周一 + 周二 + 周三 + 周四 + 周五 + 周六 + 周日 + 时间配置存在冲突,请调整 + 请至少配置一天的时间 + 关联设备需要保存排程配置,是否继续? + 请先保存排程 + 数据已发生变更,是否保存? + 排程新增成功 + 排程更新成功 + + 背景主题 + 语言选择 + 密码管理 + 浅色 + 深色 + + 再按一次退出