From 3f0260a37addfaeb84a380c0a152208d1cf9fb5b Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Fri, 10 Jul 2026 15:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  4 +--
 .../main/java/com/ckkj/water/AppConfig.java   |  3 +-
 .../com/ckkj/water/guide/LaunchActivity.java  | 24 +++++++++++----
 .../com/ckkj/water/index/IndexFragment.java   | 22 +++++++-------
 .../water/index/adapter/DeviceAdapter.java    | 30 ++++++++++++-------
 .../water/login/ForgetPasswordActivity.java   |  6 ++--
 .../water/mine/MineInfomationActivity.java    |  6 ++--
 .../com/ckkj/water/mine/SettingsActivity.java |  2 ++
 app/src/main/res/values-en/strings.xml        |  7 +++++
 app/src/main/res/values/strings.xml           | 10 ++++++-
 .../compile-file-map.properties               |  2 +-
 11 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e23acf5..f442d3a 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-07-03T09:58:25.938181100Z">
+        <DropdownSelection timestamp="2026-07-10T01:12:18.170652300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=a12bc17f" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=D122222104A9" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/ckkj/water/AppConfig.java b/app/src/main/java/com/ckkj/water/AppConfig.java
index 9e90406..9cc599d 100644
--- a/app/src/main/java/com/ckkj/water/AppConfig.java
+++ b/app/src/main/java/com/ckkj/water/AppConfig.java
@@ -21,7 +21,8 @@ public class AppConfig {
 //    public static boolean IS_TEST_REQUEST = true;
 
     /**************************本地*******************************/
-    public static String BASE_URL = "http://192.168.1.217:8081/";//测试
+    public static String BASE_URL = "http://192.168.1.217:8081/";//后端本地测试
+//    public static String BASE_URL = "http://47.97.217.123:8081/";//服务器测试
     public static String BASE_URL_TWO = BASE_URL;//测试
     public static String BASE_URL_THREE = BASE_URL;//测试
     public static boolean IS_TEST_REQUEST = true;
diff --git a/app/src/main/java/com/ckkj/water/guide/LaunchActivity.java b/app/src/main/java/com/ckkj/water/guide/LaunchActivity.java
index 8d46a75..a754e29 100644
--- a/app/src/main/java/com/ckkj/water/guide/LaunchActivity.java
+++ b/app/src/main/java/com/ckkj/water/guide/LaunchActivity.java
@@ -1,6 +1,8 @@
 package com.ckkj.water.guide;
 
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
@@ -24,6 +26,8 @@ import com.ckkj.water.network.BaseBean;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.ActivityManager;
 
+import java.util.Locale;
+
 import me.jessyan.autosize.internal.CancelAdapt;
 
 /**
@@ -54,11 +58,11 @@ public class LaunchActivity extends BaseActivity<GuideLayoutBinding, MainPresent
         if (mIsFirstEnterApp) {
             //首次进入
             showDialogtext(
-                    getString(R.string.tip_text),
-                    getString(R.string.tips_yinsizhengce_dialog),
-                    getString(R.string.agree),
-                    getString(R.string.reject),
-                    getString(R.string.user_agreement)
+                    getSystemLanguageString(R.string.tip_text),
+                    getSystemLanguageString(R.string.tips_yinsizhengce_dialog),
+                    getSystemLanguageString(R.string.agree),
+                    getSystemLanguageString(R.string.reject),
+                    getSystemLanguageString(R.string.user_agreement)
                     , new OnDialogClick() {
 
                         @Override
@@ -118,6 +122,16 @@ public class LaunchActivity extends BaseActivity<GuideLayoutBinding, MainPresent
         finish();
     }
 
+    private String getSystemLanguageString(int resId) {
+        Locale systemLocale = Resources.getSystem().getConfiguration().getLocales().get(0);
+        Locale targetLocale = Locale.CHINESE.getLanguage().equals(systemLocale.getLanguage())
+                ? Locale.SIMPLIFIED_CHINESE
+                : Locale.ENGLISH;
+        Configuration configuration = new Configuration(getResources().getConfiguration());
+        configuration.setLocale(targetLocale);
+        return createConfigurationContext(configuration).getString(resId);
+    }
+
 
     @Override
     public MainPresenter createPresenter() {
diff --git a/app/src/main/java/com/ckkj/water/index/IndexFragment.java b/app/src/main/java/com/ckkj/water/index/IndexFragment.java
index 7f7d86b..ab4534a 100644
--- a/app/src/main/java/com/ckkj/water/index/IndexFragment.java
+++ b/app/src/main/java/com/ckkj/water/index/IndexFragment.java
@@ -160,13 +160,13 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                         ArrayList<String> results = data.getStringArrayListExtra(MNScanManager.INTENT_KEY_RESULT_SUCCESS);
 
                         if (results == null || results.isEmpty()) {
-                            ToastUtil.showShort(mContext, "二维码内容不能为空");
+                            ToastUtil.showShort(mContext, getString(R.string.qr_content_empty));
                             return;
                         }
 
                         String scanContent = results.get(0);
                         if (TextUtils.isEmpty(scanContent)) {
-                            ToastUtil.showShort(mContext, "二维码内容不能为空");
+                            ToastUtil.showShort(mContext, getString(R.string.qr_content_empty));
                             return;
                         }
 
@@ -174,14 +174,14 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                         try {
                             json = new JSONObject(scanContent);
                         } catch (JSONException e) {
-                            ToastUtil.showShort(mContext, "二维码格式错误");
+                            ToastUtil.showShort(mContext, getString(R.string.qr_format_error));
                             return;
                         }
                         try {
                             WaterDeviceEntity entity = new WaterDeviceEntity();
                             if(TextUtils.isEmpty(json.getString("mac"))
                             || TextUtils.isEmpty(json.getString("name"))){
-                                ToastUtil.showShort(mContext,"请扫描正确的二维码");
+                                ToastUtil.showShort(mContext,getString(R.string.scan_correct_qr));
                                 return;
                             }
                             entity.setMacAddress(json.getString("mac"));
@@ -191,7 +191,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                                 mPresenter.bindDeviceStatus(entity);
                             }
                         } catch (JSONException e) {
-                            ToastUtil.showShort(mContext, "二维码格式错误");
+                            ToastUtil.showShort(mContext, getString(R.string.scan_correct_qr));
                             return;
                         }
                         break;
@@ -199,7 +199,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                         String resultError = data.getStringExtra(MNScanManager.INTENT_KEY_RESULT_ERROR);
                         break;
                     case MNScanManager.RESULT_CANCLE:
-                        ToastUtil.showShort(mContext,"取消扫码");
+                        ToastUtil.showShort(mContext,getString(R.string.cancel_scan));
                         break;
                 }
             }
@@ -259,6 +259,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
      */
     @Override
     public void queryDeviceBindStatusSuccess(WaterDeviceEntity entity) {
+        pendingDeviceEntity = entity.getBindDevice();
         switch (entity.getBindDeviceStatus()){
 
             case 200:
@@ -269,6 +270,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                 break;
 
             case 302:
+            case 305:
                 // 这是一台没有在mqtt中注册的设备，需要通过蓝牙连接配网,(可理解为新设备，走蓝牙，配网)
                 // 先检查蓝牙权限和开启状态
 
@@ -423,7 +425,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
     public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
         hidePermissionDialog();
         if (requestCode == REQUEST_EVENT_CODE_BLUETOOTH_PERMISSION) {
-            ToastUtil.showShort(mContext, "需要蓝牙权限才能添加设备");
+            ToastUtil.showShort(mContext, getString(R.string.bluetooth_permission_required));
         }
     }
 
@@ -451,7 +453,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
                     goToDeviceProvisioning();
                 }
             } else {
-                ToastUtil.showShort(mContext, "需要蓝牙权限才能添加设备");
+                ToastUtil.showShort(mContext, getString(R.string.bluetooth_permission_required));
             }
         }
     }
@@ -461,13 +463,13 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_ENABLE_BT) {
             if (resultCode == -1) { // RESULT_OK
-                ToastUtil.showShort(mContext, "蓝牙已开启");
+                ToastUtil.showShort(mContext, getString(R.string.bluetooth_enabled));
                 bluetoothReady = true;
                 if (pendingDeviceEntity != null) {
                     goToDeviceProvisioning();
                 }
             } else {
-                ToastUtil.showShort(mContext, "请开启蓝牙以添加设备");
+                ToastUtil.showShort(mContext, getString(R.string.enable_bluetooth_to_add_device));
             }
         }
     }
diff --git a/app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java b/app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java
index ce1219f..e2e289a 100644
--- a/app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java
+++ b/app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java
@@ -29,19 +29,27 @@ public class DeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity, BaseViewH
         View viewStatus = holder.getView(R.id.view_status_dot);
         holder.setText(R.id.tv_device_name,item.getDeviceName());
         holder.setText(R.id.tv_device_serial,item.getDeviceSn());
-        switch (item.getWorkStatus()){
-            case "0"://待机
-                holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_not_working));
-                holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_999999));
-                viewStatus.setBackground(mContext.getResources().getDrawable(R.drawable.shape_status_dot_999999));
-                break;
+        //设备联网在线
+        if(item.getStatus().equals("1")){
+            switch (item.getWorkStatus()){
+                case "0"://待机
+                    holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_not_working));
+                    holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_999999));
+                    viewStatus.setBackground(mContext.getResources().getDrawable(R.drawable.shape_status_dot_999999));
+                    break;
 
-            case "1"://工作中
-                holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_working));
-                holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_24B326));
-                viewStatus.setBackground(mContext.getResources().getDrawable(R.drawable.shape_status_dot_green));
-                break;
+                case "1"://工作中
+                    holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_working));
+                    holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_24B326));
+                    viewStatus.setBackground(mContext.getResources().getDrawable(R.drawable.shape_status_dot_green));
+                    break;
+            }
+        }else{
+            holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_offline));
+            holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_999999));
+            viewStatus.setBackground(mContext.getResources().getDrawable(R.drawable.shape_status_dot_999999));
         }
+
 //        if(item.getStatus().equals("1") || item.getStatus().equals("2")){
 //        }else{
 //            holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_offline));
diff --git a/app/src/main/java/com/ckkj/water/login/ForgetPasswordActivity.java b/app/src/main/java/com/ckkj/water/login/ForgetPasswordActivity.java
index bb946f3..b9a5f4b 100644
--- a/app/src/main/java/com/ckkj/water/login/ForgetPasswordActivity.java
+++ b/app/src/main/java/com/ckkj/water/login/ForgetPasswordActivity.java
@@ -153,7 +153,7 @@ public class ForgetPasswordActivity extends BaseActivity<RegisterLayoutBinding,
     }
 
 
-    private CountDownTimer cdTimer = new CountDownTimer(6000, 1000) {
+    private CountDownTimer cdTimer = new CountDownTimer(60000, 1000) {
         @Override
         public void onTick(long millisUntilFinished) {
             viewBinding.tvGetVerifiCode.setText("(" + millisUntilFinished / 1000 + ") " + getString(R.string.login_resend));
@@ -191,7 +191,9 @@ public class ForgetPasswordActivity extends BaseActivity<RegisterLayoutBinding,
 
     @Override
     public void getPhoneCodeSuccess(BaseBean bean) {
-
+        hideDialogLoading();
+        ToastUtil.showLong(mContext, getString(R.string.login_code_sent));
+        cdTimer.start();
     }
 
     @Override
diff --git a/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java b/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
index eefb273..257e37a 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
@@ -21,6 +21,8 @@ import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.mine.mvp.MinePresenter;
 import com.ckkj.water.network.BaseBean;
 import com.ckkj.water.utils.LubanCompressUtil;
+import com.ckkj.water.utils.PreviewFileUtil;
+import com.ckkj.water.utils.dataUtil.FileUtil;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.ThemeManager;
 import com.ckkj.water.utils.manager.WaterUserInfoManager;
@@ -119,8 +121,8 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
                                 }
                                 break;
                             case 1:
-//                                String suffix = FileUtil.getFileSuffixWithQuestion(WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
-//                                PreviewFileUtil.previewFiles(mContext, suffix, WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
+                                String suffix = FileUtil.getFileSuffixWithQuestion(mUserBean.getUser().getAvatar());
+                                PreviewFileUtil.previewFiles(mContext, suffix, mUserBean.getUser().getAvatar());
                                 break;
                         }
                     }
diff --git a/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java b/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
index 5ad80db..ddf304e 100644
--- a/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
@@ -282,6 +282,8 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
                     });
                 }
             });
+        }else{
+            ToastUtil.showShort(mContext,"当前已是最新版本");
         }
     }
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 6b9ca01..a5db394 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -297,6 +297,13 @@
     <string name="tips_yinsizhengce_dialog">Thank you for using WaterX Smart Irrigation!\n\nTo better protect your personal information, we have updated our Privacy Policy and User Agreement. Please read the following:\n1. We may collect the personal information necessary to provide our services.\n2. You can view, correct, delete your personal information or withdraw your authorization at any time.\n3. We will not use your personal information for other purposes without your consent.\n4. We protect minors\' personal information in accordance with applicable laws.\n5. We reserve the right to restrict or terminate services if your account is used in violation of applicable rules.\n\nBy tapping &quot;Agree&quot;, you confirm that you have read and agree to the Privacy Policy and User Agreement.</string>
 
 
+    <string name="qr_content_empty">QR code content cannot be empty.</string>
+    <string name="qr_format_error">Invalid QR code format.</string>
+    <string name="scan_correct_qr">Please scan the correct QR code.</string>
+    <string name="cancel_scan">Cancel Scan</string>
+    <string name="bluetooth_permission_required">Bluetooth permission is required to add a device.</string>
+    <string name="bluetooth_enabled">Bluetooth is enabled.</string>
+    <string name="enable_bluetooth_to_add_device">Please enable Bluetooth to add a device.</string>
     <!-- End -->
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13934df..febdb88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,6 +289,14 @@
 
 
 
+    <string name="qr_content_empty">二维码内容不能为空</string>
+    <string name="qr_format_error">二维码格式错误</string>
+    <string name="scan_correct_qr">请扫描正确的二维码</string>
+    <string name="cancel_scan">取消扫码</string>
+    <string name="bluetooth_permission_required">需要蓝牙权限才能添加设备</string>
+    <string name="bluetooth_enabled">蓝牙已开启</string>
+    <string name="enable_bluetooth_to_add_device">请开启蓝牙以添加设备</string>
+
     <!--结束-->
 
 
@@ -322,7 +330,7 @@
 </string>
 
 
-    <string name="app_name">智能浇水</string>
+    <string name="app_name">渥田氏</string>
 
     <!-- ==================== 登录页 ==================== -->
     <string name="login_app_name">星语明灯</string>
diff --git a/imagepickerl/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/imagepickerl/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 6829d12..f5d4094 100644
--- a/imagepickerl/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/imagepickerl/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sun May 17 09:03:15 CST 2026
+#Fri Jul 10 09:12:26 CST 2026
 D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\src\\main\\res\\drawable-hdpi\\ef_ic_arrow_back.png=D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ef_ic_arrow_back.png
 D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\src\\main\\res\\drawable-hdpi\\ef_ic_arrow_forward.png=D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ef_ic_arrow_forward.png
 D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\src\\main\\res\\drawable-hdpi\\ef_ic_camera_white.png=D\:\\AndroidWorkSpace\\WaterProject\\WaterProject\\imagepickerl\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ef_ic_camera_white.png