diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewCommunityAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewCommunityAddActivity.java index 7291590..1b30bb6 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewCommunityAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewCommunityAddActivity.java @@ -538,7 +538,7 @@ public class NewCommunityAddActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewSearchPersonByHouseActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewSearchPersonByHouseActivity.java index 224d799..8c6dbf0 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewSearchPersonByHouseActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewSearchPersonByHouseActivity.java @@ -23,7 +23,7 @@ import com.sucstepsoft.cm_utils.utils.ToastUtils; import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.realtimelocation.R; -import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.NewHouseDetailActivity; +import com.sucstepsoft.realtimelocation.activitys.census.normal.CensusRegisterDetailActivity; import com.sucstepsoft.realtimelocation.adapters.NewSearchHousePersonAdapter; import com.sucstepsoft.realtimelocation.beans.CommunityBean; import com.sucstepsoft.realtimelocation.beans.DicBean; @@ -597,8 +597,8 @@ public class NewSearchPersonByHouseActivity extends BaseActivity { */ private void showDetail(HousePersonBean.RowsBean rowsBean) { Intent intent = new Intent(); - intent.putExtra("id", rowsBean.getHouseDTO().getHouseId()); - intent.setClass(mActivity, NewHouseDetailActivity.class); + intent.putExtra("id", rowsBean.getPopulationInfoId()); + intent.setClass(mActivity, CensusRegisterDetailActivity.class); startActivityForResult(intent, 1234); } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingAddActivity.java index 9d52464..5f6d0d2 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingAddActivity.java @@ -554,7 +554,7 @@ public class NewBuildingAddActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { 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 9e5ad14..a7a661b 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 @@ -42,6 +42,7 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; +import com.sucstepsoft.cm_utils.utils.IDCard; import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.ToastUtils; import com.sucstepsoft.cm_utils.utils.UIUtil; @@ -483,7 +484,8 @@ public class NewGroupHouseAddActivity extends BaseActivity { mBuildingPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { mSelBuilding = mBuildingList.get(options1); mTvBuilding.setText(mSelBuilding.getName()); - + //构建单元楼层数据 + buildUnitData(mSelBuilding); }) .setTitleText("楼/排") .isDialog(false) @@ -497,6 +499,45 @@ public class NewGroupHouseAddActivity extends BaseActivity { } } + /** + * 构建 + * + * @param selBuilding + */ + private void buildUnitData(NewBuildingBean.RowsBean selBuilding) { + boolean isLegal = !TextUtils.isEmpty(selBuilding.getUnitNum()) + && !TextUtils.isEmpty(selBuilding.getFloorsNum()) + && IDCard.isNumeric(selBuilding.getUnitNum()) + && IDCard.isNumeric(selBuilding.getFloorsNum()); + if (isLegal) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "加载中..."); + dialog.show(); + mDatas.clear(); + int unitNum = Integer.parseInt(selBuilding.getUnitNum()); + int floorNum = Integer.parseInt(selBuilding.getFloorsNum()); + for (int i = 1; i <= unitNum; i++) { + SaveGroupHouse.ResultListBean groupBean = new SaveGroupHouse.ResultListBean(); + groupBean.setUnitValue(i + "单元/列"); + List floorBeans = new ArrayList<>(); + for (int j = 1; j <= floorNum; j++) { + SaveGroupHouse.ResultListBean.FloorListBean.HouseListBean roomBean = new SaveGroupHouse.ResultListBean.FloorListBean.HouseListBean(); + SaveGroupHouse.ResultListBean.FloorListBean floorBean = new SaveGroupHouse.ResultListBean.FloorListBean(); + List roomBeans = new ArrayList<>(); + roomBeans.add(roomBean); + floorBean.setHouseList(roomBeans); + floorBean.setFloorValue(j + "层"); + floorBeans.add(floorBean); + } + groupBean.setFloorList(floorBeans); + mDatas.add(groupBean); + } + if (mUnitAdapter != null) { + mUnitAdapter.setData(mDatas); + } + dialog.dismiss(); + } + } + /** * 根据小区获取楼 @@ -711,7 +752,7 @@ public class NewGroupHouseAddActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewHouseAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewHouseAddActivity.java index f6139f0..12d3649 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewHouseAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewHouseAddActivity.java @@ -679,7 +679,7 @@ public class NewHouseAddActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewRuleHouseAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewRuleHouseAddActivity.java index 2d16dbf..a306640 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewRuleHouseAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewRuleHouseAddActivity.java @@ -333,7 +333,7 @@ public class NewRuleHouseAddActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/BuildingManageFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/BuildingManageFragment.java index 71ae762..d49abf7 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/BuildingManageFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/BuildingManageFragment.java @@ -345,7 +345,7 @@ public class BuildingManageFragment extends LazyFragment { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/CommunityManageFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/CommunityManageFragment.java index fd82586..c669f88 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/CommunityManageFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/CommunityManageFragment.java @@ -346,7 +346,7 @@ public class CommunityManageFragment extends LazyFragment { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/HouseManageNewFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/HouseManageNewFragment.java index 6353eae..bac7ef6 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/HouseManageNewFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/HouseManageNewFragment.java @@ -348,7 +348,7 @@ public class HouseManageNewFragment extends LazyFragment { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) + .getCommunityDicList(areaId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseBean.java index e21b537..c4209ce 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseBean.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseBean.java @@ -56,12 +56,12 @@ public class NewHouseBean { private String documentId; private String documentName; private String documentNum; - private int floorsNum; + private String floorsNum; private String gmtCreate; private String gmtModified; private String homeowner; private String houseId; - private int houseNum; + private String houseNum; private String houseType; private int isDelete; private int isRental; @@ -78,7 +78,7 @@ public class NewHouseBean { private String residentialId; private String residentialName; private String roomArea; - private int roomNum; + private String roomNum; private String roomUseId; private String roomUseName; private String street; @@ -87,7 +87,7 @@ public class NewHouseBean { private String structureName; private String typeId; private String typeName; - private int unitNum; + private String unitNum; public String getAffiliatedUnit() { return affiliatedUnit; @@ -273,11 +273,11 @@ public class NewHouseBean { this.documentNum = documentNum; } - public int getFloorsNum() { + public String getFloorsNum() { return floorsNum; } - public void setFloorsNum(int floorsNum) { + public void setFloorsNum(String floorsNum) { this.floorsNum = floorsNum; } @@ -313,11 +313,11 @@ public class NewHouseBean { this.houseId = houseId; } - public int getHouseNum() { + public String getHouseNum() { return houseNum; } - public void setHouseNum(int houseNum) { + public void setHouseNum(String houseNum) { this.houseNum = houseNum; } @@ -449,11 +449,11 @@ public class NewHouseBean { this.roomArea = roomArea; } - public int getRoomNum() { + public String getRoomNum() { return roomNum; } - public void setRoomNum(int roomNum) { + public void setRoomNum(String roomNum) { this.roomNum = roomNum; } @@ -521,11 +521,11 @@ public class NewHouseBean { this.typeName = typeName; } - public int getUnitNum() { + public String getUnitNum() { return unitNum; } - public void setUnitNum(int unitNum) { + public void setUnitNum(String unitNum) { this.unitNum = unitNum; } } diff --git a/app/src/main/res/layout/activity_add_new_building.xml b/app/src/main/res/layout/activity_add_new_building.xml index 399e043..9d12fee 100644 --- a/app/src/main/res/layout/activity_add_new_building.xml +++ b/app/src/main/res/layout/activity_add_new_building.xml @@ -109,7 +109,7 @@ style="@style/item_content" android:layout_gravity="center_vertical" android:hint="请输入楼排名称" - android:inputType="textMultiLine" /> + /> @@ -125,7 +125,7 @@ style="@style/item_content" android:layout_gravity="center_vertical" android:hint="请输入楼排号" - android:inputType="textMultiLine" /> + /> @@ -141,7 +141,8 @@ style="@style/item_content" android:layout_gravity="center_vertical" android:hint="请输入楼层数" - android:inputType="textMultiLine" /> + android:inputType="number" + /> @@ -157,7 +158,8 @@ style="@style/item_content" android:layout_gravity="center_vertical" android:hint="请输入单元/排数" - android:inputType="textMultiLine" /> + android:inputType="number" + /> diff --git a/build.gradle b/build.gradle index 6af227e..0bf5bfe 100755 --- a/build.gradle +++ b/build.gradle @@ -61,8 +61,8 @@ ext { gTargetSdkVersion = 28 // gVersionCode = 3 // gVersionName = '1.0.3' - gVersionCode=50 - gVersionName='1.5.0' + gVersionCode=51 + gVersionName='1.5.1' //Router编译版本 gRouterApiVersion = '1.4.1' gRouterCompileVersion = '1.2.2' diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/CheckUpdateUtils.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/CheckUpdateUtils.java index e0280e5..7262f48 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/CheckUpdateUtils.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/CheckUpdateUtils.java @@ -96,6 +96,7 @@ public class CheckUpdateUtils { final ProgressDialog dialog = new ProgressDialog(context); dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); dialog.setProgressNumberFormat("%1d Mb /%2d Mb"); + dialog.setCancelable(false); //文件存放地址 String dir = Environment.getExternalStorageDirectory().toString(); @@ -111,8 +112,6 @@ public class CheckUpdateUtils { @Override public void onProgress(long currentBytes, long totalBytes) { dialog.setMax((int) totalBytes / 1024 / 1024); -// dialog.setMax((int) totalBytes); -// dialog.setProgress((int) currentBytes); dialog.setProgress((int) currentBytes / 1024 / 1024); } diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index ece6dc6..36745be 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -9,8 +9,8 @@ import com.sucstepsoft.cm_utils.constant.PathConfig; */ public class BaseUrlApi { -// public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ - public static final String IP = "http://192.168.0.15:7021/usercenter/"; /*测试统一用户*/ + public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ +// public static final String IP = "http://192.168.0.15:7021/usercenter/"; /*测试统一用户*/ // public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/ public static final String BASE_URL = IP; public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion"; @@ -18,9 +18,9 @@ public class BaseUrlApi { public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan"; public static final int PHOTO_REQUEST = 233; public static final int CAMERA_REQUEST = 123; -// public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ + public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ // public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/ - public static final String BASE_IP_P = "http://192.168.0.15:7022/"; /*测试IP*/ +// public static final String BASE_IP_P = "http://192.168.0.15:7023/"; /*测试IP*/ public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/ // public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/ public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/ diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/IDCard.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/IDCard.java index 76b1f6e..0076262 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/IDCard.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/IDCard.java @@ -138,7 +138,7 @@ public class IDCard { * @param str * @return */ - private static boolean isNumeric(String str) { + public static boolean isNumeric(String str) { Pattern pattern = Pattern.compile("[0-9]*"); Matcher isNum = pattern.matcher(str); if (isNum.matches()) {