From ec59249b3bdd2c3d1743e8dae862f24bfcff98da Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Mon, 20 Jul 2026 15:47:08 +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

---
 app/src/main/java/com/ckkj/water/AppConfig.java         | 4 ++--
 app/src/main/java/com/ckkj/water/base/BaseActivity.java | 4 ++++
 app/src/main/res/layout/index_device_list_item.xml      | 3 ++-
 app/src/main/res/layout/mine_information_layout.xml     | 9 +++++++--
 app/src/main/res/layout/water_plan_list_item.xml        | 3 ++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/AppConfig.java b/app/src/main/java/com/ckkj/water/AppConfig.java
index 9cc599d..dc65f61 100644
--- a/app/src/main/java/com/ckkj/water/AppConfig.java
+++ b/app/src/main/java/com/ckkj/water/AppConfig.java
@@ -21,8 +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://47.97.217.123: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/base/BaseActivity.java b/app/src/main/java/com/ckkj/water/base/BaseActivity.java
index 9ef4c2f..8cebb19 100644
--- a/app/src/main/java/com/ckkj/water/base/BaseActivity.java
+++ b/app/src/main/java/com/ckkj/water/base/BaseActivity.java
@@ -1253,6 +1253,10 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
                         });
                 break;
 
+            case INPUT_TYPE_NORMAL:
+                editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
+                break;
+
             default:
                 editText.setInputType(
                         InputType.TYPE_CLASS_TEXT
diff --git a/app/src/main/res/layout/index_device_list_item.xml b/app/src/main/res/layout/index_device_list_item.xml
index 81edba0..f8c803a 100644
--- a/app/src/main/res/layout/index_device_list_item.xml
+++ b/app/src/main/res/layout/index_device_list_item.xml
@@ -30,7 +30,8 @@
                     android:id="@+id/tv_device_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="智能浇水设备A1"
+                    android:singleLine="true"
+                    android:text=""
                     android:textColor="@color/textPrimaryColor"
                     android:textSize="17sp"
                     android:textStyle="bold" />
diff --git a/app/src/main/res/layout/mine_information_layout.xml b/app/src/main/res/layout/mine_information_layout.xml
index 68fef3f..4724a27 100644
--- a/app/src/main/res/layout/mine_information_layout.xml
+++ b/app/src/main/res/layout/mine_information_layout.xml
@@ -59,6 +59,7 @@
         android:layout_height="@dimen/dp_45"
         android:layout_marginTop="@dimen/dp_20">
         <TextView
+            android:id="@+id/tv_name_key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
@@ -76,14 +77,18 @@
             android:layout_alignParentRight="true"/>
         <TextView
             android:id="@+id/tv_nickname_value"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/img_point1"
+            android:layout_toRightOf="@+id/tv_name_key"
             android:layout_marginRight="@dimen/dp_20"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:gravity="right"
+            android:singleLine="true"
             android:textSize="14sp"
             android:textColor="@color/color_999999"
-            android:text="这里是昵称"/>
+            android:text=""/>
     </RelativeLayout>
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/water_plan_list_item.xml b/app/src/main/res/layout/water_plan_list_item.xml
index c83e6b1..06604f8 100644
--- a/app/src/main/res/layout/water_plan_list_item.xml
+++ b/app/src/main/res/layout/water_plan_list_item.xml
@@ -27,7 +27,8 @@
                     android:id="@+id/tv_device_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="智能浇水设备A1"
+                    android:singleLine="true"
+                    android:text=""
                     android:textColor="@color/textPrimaryColor"
                     android:textSize="17sp"
                     android:textStyle="bold" />