From 01cd2634f16b5d855db1a0d6e6feeab6343d2841 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 26 Jan 2024 11:13:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=B9=E9=87=8F=E5=BB=BA?= =?UTF-8?q?=E6=88=BF=E5=8D=95=E5=85=83=E5=B1=82=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../census/newhouse/activitys/NewGroupHouseAddActivity.java | 4 ++-- app/src/main/res/layout/item_floor_input.xml | 2 ++ app/src/main/res/layout/item_unit_item.xml | 2 ++ build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewGroupHouseAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewGroupHouseAddActivity.java index a7a661b..e8d6ee9 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewGroupHouseAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewGroupHouseAddActivity.java @@ -517,7 +517,7 @@ public class NewGroupHouseAddActivity extends BaseActivity { int floorNum = Integer.parseInt(selBuilding.getFloorsNum()); for (int i = 1; i <= unitNum; i++) { SaveGroupHouse.ResultListBean groupBean = new SaveGroupHouse.ResultListBean(); - groupBean.setUnitValue(i + "单元/列"); + groupBean.setUnitValue(i + ""); List floorBeans = new ArrayList<>(); for (int j = 1; j <= floorNum; j++) { SaveGroupHouse.ResultListBean.FloorListBean.HouseListBean roomBean = new SaveGroupHouse.ResultListBean.FloorListBean.HouseListBean(); @@ -525,7 +525,7 @@ public class NewGroupHouseAddActivity extends BaseActivity { List roomBeans = new ArrayList<>(); roomBeans.add(roomBean); floorBean.setHouseList(roomBeans); - floorBean.setFloorValue(j + "层"); + floorBean.setFloorValue(j + ""); floorBeans.add(floorBean); } groupBean.setFloorList(floorBeans); diff --git a/app/src/main/res/layout/item_floor_input.xml b/app/src/main/res/layout/item_floor_input.xml index c484593..beb269a 100644 --- a/app/src/main/res/layout/item_floor_input.xml +++ b/app/src/main/res/layout/item_floor_input.xml @@ -20,6 +20,8 @@ android:id="@+id/et_num" style="@style/item_content_match" android:imeOptions="actionNext" + android:enabled="false" + android:textColor="@color/black" android:singleLine="true" android:hint="请输入层/院号" /> diff --git a/app/src/main/res/layout/item_unit_item.xml b/app/src/main/res/layout/item_unit_item.xml index 0175e9d..c42f0fe 100644 --- a/app/src/main/res/layout/item_unit_item.xml +++ b/app/src/main/res/layout/item_unit_item.xml @@ -22,6 +22,8 @@ android:id="@+id/et_num" style="@style/item_content_match" android:imeOptions="actionNext" + android:enabled="false" + android:textColor="@color/black" android:singleLine="true" android:hint="请输入单元/列号" /> diff --git a/build.gradle b/build.gradle index 0bf5bfe..c1a0590 100755 --- a/build.gradle +++ b/build.gradle @@ -61,8 +61,8 @@ ext { gTargetSdkVersion = 28 // gVersionCode = 3 // gVersionName = '1.0.3' - gVersionCode=51 - gVersionName='1.5.1' + gVersionCode=52 + gVersionName='1.5.2' //Router编译版本 gRouterApiVersion = '1.4.1' gRouterCompileVersion = '1.2.2'