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 }); 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"> + android:text=""/>