diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a8437e8..be886e1 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -273,6 +273,18 @@ android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" tools:ignore="LockedOrientationActivity" /> + + + + mDatas; + private NewSearchHouseAdapter mAdapter; + + private int mCurPage = 1; + + private String mKeywords; + + + @Override + protected int setLayoutId() { + return R.layout.activity_new_search_house_by_person; + } + + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + refreshView(STATE_LOAD_SUCCESS); + mTvBaseTitle.setText("以人找房"); + buildData(); + setStateView(12); + } + + private void buildData() { + mBtnSearch.setOnClickListener(v -> doSearch()); + mIvClear.setOnClickListener(v -> { + mKeywords = ""; + mEtSearchContent.setText(""); + mDatas.clear(); + mAdapter.notifyDataSetChanged(); + setStateView(12); + }); + mDatas = new ArrayList<>(); + mAdapter = new NewSearchHouseAdapter(mActivity, mDatas, 1); + LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity); + layoutManager.setOrientation(LinearLayoutManager.VERTICAL); + mXlvItems.setLoadingMoreEnabled(true); + mXlvItems.setPullRefreshEnabled(true); + mXlvItems.setLayoutManager(layoutManager); + mXlvItems.setAdapter(mAdapter); + mAdapter.addOnItemClickListener(this::showDetail); + mXlvItems.setRefreshProgressStyle(ProgressStyle.BallGridBeat); + mXlvItems.setLoadingMoreProgressStyle(ProgressStyle.Pacman); + mXlvItems.setLoadingListener(new XRecyclerView.LoadingListener() { + @Override + public void onRefresh() { + refreshData(); + } + + @Override + public void onLoadMore() { + loadMore(); + } + }); + mEtSearchContent.setOnEditorActionListener((v, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + hideSoftKeyboard(); + setStateView(13); + mKeywords = v.getText().toString().trim(); + mCurPage = 1; + doSearchHouseByPerson(mCurPage); + return true; + } else { + return false; + } + }); + } + + /** + * 房屋详情 + * + * @param rowsBean + */ + private void showDetail(HousePersonBean.RowsBean rowsBean) { + Intent intent = new Intent(); + intent.putExtra("id", rowsBean.getHouseDTO().getHouseId()); + intent.setClass(mActivity, NewHouseDetailActivity.class); + startActivityForResult(intent, 1234); + } + + // 加载更多 + private void loadMore() { + doSearchHouseByPerson(mCurPage); + } + + /** + * 刷新数据 + */ + private void refreshData() { + mCurPage = 1; + doSearchHouseByPerson(mCurPage); + } + + /** + * + */ + private void doSearch() { + + String searchContent = mEtSearchContent.getText().toString().trim(); + if (!TextUtils.isEmpty(searchContent)) { + startSearch(searchContent); + //判断是手机号还是身份证号码 +// if (isHasChinese(searchContent)) { +// LogUtils.e("包含中文"); +// startSearch(searchContent); +// } else { +// if (searchContent.length() == 11) { +// LogUtils.e("手机号"); +// startSearch(searchContent); +// } else { +// LogUtils.e("身份证号码"); +// //判断身份证号码是否正确 +// if (!RegexUtils.isIDNumber(searchContent)) { +// ToastUtils.showShort("请输入正确的身份证号码"); +// } else { +// startSearch(searchContent); +// } +// } +// } + } else { + ToastUtils.showShort("请输入查询内容"); + } + } + + private void startSearch(String searchContent) { + hideSoftKeyboard(); + setStateView(13); + mKeywords = searchContent; + mCurPage = 1; + doSearchHouseByPerson(mCurPage); + } + + private boolean isHasChinese(String conetnt) { + String regEx = "[\u4e00-\u9fa5]"; + Pattern compile = Pattern.compile(regEx); + Matcher matcher = compile.matcher(conetnt); + while (matcher.find()) { + return true; + } + return false; + } + + /** + * 进行搜索 + */ + private void doSearchHouseByPerson(int page) { + mCurPage = page; + RetrofitManager.getInstance() + .create(LocationApiService.class) + .doSearchHouseByPersonV3(mKeywords, page + "", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(HousePersonBean leaveListBean) { + if (leaveListBean != null && leaveListBean.getRows().size() > 0) { + ++mCurPage; + if (page == 1) { + mDatas.clear(); + mDatas.addAll(leaveListBean.getRows()); + } else { + mDatas.addAll(leaveListBean.getRows()); + } + setStateView(14); + mAdapter.notifyDataSetChanged(); + mXlvItems.refreshComplete(); + if (mDatas.size() >= leaveListBean.getTotal()) { + mXlvItems.loadMoreComplete(); + mXlvItems.setNoMore(true); + } else { + mXlvItems.loadMoreComplete(); + mXlvItems.setNoMore(false); + } + } else { + if (page > 1) { + mXlvItems.loadMoreComplete(); + mXlvItems.setNoMore(true); + setStateView(14); + } else { + if (TextUtils.isEmpty(mKeywords)) { + //无数据 + setStateView(15); + } else { + setStateView(15); + ToastUtils.showShort("未查询到相关内容"); + } + } + } + } + + @Override + public void onError(Throwable e) { + setStateView(16); + mXlvItems.refreshComplete(); + mXlvItems.loadMoreComplete(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + + /** + * 根据状态显示 + * 12 默认 + * 13 搜索中 + * 14 搜索完成有数据 + * 15 搜索完成没有数据 + * 16 搜索失败 + * + * @param state + */ + private void setStateView(int state) { + switch (state) { + case 12://默认 + mXlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_SEARCH); + break; + case 13://搜索中 + mXlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_LOAD); + break; + case 14://搜索完成有数据 + mXlvItems.setVisibility(View.VISIBLE); + mCsvState.setState(CustomStateView.STATE_SUCCESS); + break; + case 15://搜索完成没有数据 + mXlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_EMPTY); + break; + case 16://搜索失败 + mXlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_ERROR); + break; + } + } + + +} \ No newline at end of file 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 new file mode 100644 index 0000000..224d799 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/NewSearchPersonByHouseActivity.java @@ -0,0 +1,750 @@ +package com.sucstepsoft.realtimelocation.activitys.census.house; + +import android.app.ProgressDialog; +import android.content.Intent; +import android.graphics.Color; +import android.support.v7.widget.LinearLayoutManager; +import android.text.TextUtils; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.Switch; +import android.widget.TextView; + +import com.bigkoo.pickerview.builder.OptionsPickerBuilder; +import com.bigkoo.pickerview.view.OptionsPickerView; +import com.jcodecraeer.xrecyclerview.ProgressStyle; +import com.jcodecraeer.xrecyclerview.XRecyclerView; +import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.core.widget.views.CustomStateView; +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.adapters.NewSearchHousePersonAdapter; +import com.sucstepsoft.realtimelocation.beans.CommunityBean; +import com.sucstepsoft.realtimelocation.beans.DicBean; +import com.sucstepsoft.realtimelocation.beans.HousePersonBean; +import com.sucstepsoft.realtimelocation.beans.NewBuildingBean; +import com.sucstepsoft.realtimelocation.beans.NewCommunityDetailBean; +import com.sucstepsoft.realtimelocation.beans.StreetBean; +import com.sucstepsoft.realtimelocation.net.LocationApiService; +import com.sucstepsoft.realtimelocation.utils.ExceptionHandler; +import com.sucstepsoft.realtimelocation.widget.ExpandableLinearLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +/** + * 以房找人 + */ +public class NewSearchPersonByHouseActivity extends BaseActivity { + + @BindView(R.id.tv_street) + TextView mTvStreet; + @BindView(R.id.tv_community) + TextView mTvCommunity; + @BindView(R.id.tv_community_area) + TextView mTvCommunityArea; + @BindView(R.id.tv_building) + TextView mTvBuilding; + @BindView(R.id.tv_unit) + TextView mTvUnit; + @BindView(R.id.tv_floor) + TextView mTvFloor; + @BindView(R.id.et_room) + EditText mEtRoom; + @BindView(R.id.sw_is_hire) + Switch mSwIsHire; + @BindView(R.id.sw_is_empty) + Switch mSwIsEmpty; + @BindView(R.id.btn_confirm) + Button mBtnConfirm; + @BindView(R.id.elv_content) + ExpandableLinearLayout mElvContent; + @BindView(R.id.ll_content) + LinearLayout mLlContent; + @BindView(R.id.rlv_items) + XRecyclerView mRlvItems; + @BindView(R.id.csv_state) + CustomStateView mCsvState; + @BindView(R.id.btn_reset) + Button mBtnReset; + private Unbinder mBind; + + private List mDatas; + private NewSearchHousePersonAdapter mAdapter; + private int mCurPage = 1; + + private OptionsPickerView mArea4Picker; + private OptionsPickerView mArea5Picker; + private List mArea4List; + private List mArea5List; + private StreetBean mSelArea4; + private CommunityBean mSelArea5; + + private List mCommunityList; + private OptionsPickerView mCommunityPicker; + private NewCommunityDetailBean mSelCommunity; + private NewBuildingBean.RowsBean mSelBuilding; + private List mBuildingList; + private OptionsPickerView mBuildingPicker; + private List mUnitList; + private List mFloorList; + private DicBean mSelUnit; + private DicBean mSelFloor; + private OptionsPickerView mUnitPicker; + private OptionsPickerView mFloorPicker; + + @Override + protected int setLayoutId() { + return R.layout.activity_new_search_person_by_house; + } + + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + refreshView(STATE_LOAD_SUCCESS); + mTvBaseTitle.setText("以房找人"); + buildData(); + setStateView(12); + } + + private void buildData() { + mTvStreet.setOnClickListener(v -> onShowArea4());//街道 + mTvCommunity.setOnClickListener(v -> onShowArea5());//社区 + mTvCommunityArea.setOnClickListener(v -> onShowCommunity());//小区 + mTvBuilding.setOnClickListener(v -> onShowBuildNum());//楼排 + mTvUnit.setOnClickListener(v -> onShowUnit());//单元/列 + mTvFloor.setOnClickListener(v -> onShowFloor());//层 + mCsvState.setState(CustomStateView.STATE_SEARCH); + mBtnConfirm.setOnClickListener(v -> doSearch()); + mDatas = new ArrayList<>(); + mAdapter = new NewSearchHousePersonAdapter(mActivity, mDatas, 2); + LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity); + layoutManager.setOrientation(LinearLayoutManager.VERTICAL); + mRlvItems.setLoadingMoreEnabled(true); + mRlvItems.setPullRefreshEnabled(true); + mRlvItems.setLayoutManager(layoutManager); + mRlvItems.setAdapter(mAdapter); + mAdapter.addOnItemClickListener(this::showDetail); + mRlvItems.setRefreshProgressStyle(ProgressStyle.BallGridBeat); + mRlvItems.setLoadingMoreProgressStyle(ProgressStyle.Pacman); + mRlvItems.setLoadingListener(new XRecyclerView.LoadingListener() { + @Override + public void onRefresh() { + refreshData(); + } + + @Override + public void onLoadMore() { + loadMore(); + } + }); + mBtnReset.setOnClickListener(v -> resetSearchOptions()); + } + + /** + * 显示楼排选择 + */ + private void onShowBuildNum() { + if (mSelCommunity == null) { + ToastUtils.showShort("请选择所在小区"); + } else { + if (mBuildingList == null) { + getAllUnitNum(mSelCommunity.getResidentialId()); + } else { + mBuildingPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelBuilding = mBuildingList.get(options1); + mTvBuilding.setText(mSelBuilding.getName()); + mSelUnit = null; + mUnitList = null; + mTvUnit.setText(""); + + mSelFloor = null; + mFloorList = null; + mTvFloor.setText(""); + //构建单元 层数 + buildBuildingData(mSelBuilding); + }) + .setTitleText("楼/排") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mBuildingPicker.setPicker(mBuildingList); + mBuildingPicker.show(); + } + } + } + + private void onShowUnit() { + if (mUnitList == null) { + ToastUtils.showShort("所选楼/排未录入单元数量"); + } else { + mUnitPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelUnit = mUnitList.get(options1); + mTvUnit.setText(mSelUnit.getDictionaryName()); + }) + .setTitleText("楼/排") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mUnitPicker.setPicker(mUnitList); + mUnitPicker.show(); + } + } + + private void onShowFloor() { + if (mFloorList == null) { + ToastUtils.showShort("所选楼/排未录入层院数量"); + } else { + mFloorPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelFloor = mFloorList.get(options1); + mTvFloor.setText(mSelFloor.getDictionaryName()); + }) + .setTitleText("层/院") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mFloorPicker.setPicker(mFloorList); + mFloorPicker.show(); + } + } + + + /** + * 根据小区获取楼 + * + * @param residentialId + */ + private void getAllUnitNum(String residentialId) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getAllBuilding(residentialId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List newCommunityDetailBeans) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + if (newCommunityDetailBeans != null && newCommunityDetailBeans.size() > 0) { + mBuildingList = newCommunityDetailBeans; + onShowBuildNum(); + } else { + ToastUtils.showShort("所选小区下,暂无楼/排信息"); + } + } + + @Override + public void onError(Throwable e) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 构建单元 层 + * + * @param selBuilding + */ + private void buildBuildingData(NewBuildingBean.RowsBean selBuilding) { + String unitNum = selBuilding.getUnitNum(); + String floorNum = selBuilding.getFloorsNum(); + if (!TextUtils.isEmpty(unitNum)) { + mUnitList = new ArrayList<>(); + try { + int unitInt = Integer.parseInt(unitNum); + for (int i = 0; i < unitInt; i++) { + DicBean b = new DicBean(); + b.setDictionaryName(i + 1 + ""); + mUnitList.add(b); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + if (!TextUtils.isEmpty(floorNum)) { + try { + mFloorList = new ArrayList<>(); + int floorInt = Integer.parseInt(floorNum); + for (int i = 0; i < floorInt; i++) { + DicBean b = new DicBean(); + b.setDictionaryName(i + 1 + ""); + mFloorList.add(b); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + private void resetSearchOptions() { + mArea4List = null; + mTvStreet.setText(""); + mSelArea4 = null; + mSelArea5 = null; + mTvCommunity.setText(""); + mArea5List = null; + mSelCommunity = null; + mCommunityList = null; + mTvCommunityArea.setText(""); + mSelBuilding = null; + mBuildingList = null; + mTvBuilding.setText(""); + mSelUnit = null; + mTvUnit.setText(""); + mSelFloor = null; + mTvFloor.setText(""); + mEtRoom.setText(""); + mSwIsHire.setChecked(false); + mSwIsEmpty.setChecked(false); + doSearch(); + } + + /** + * area4 + */ + private void onShowArea4() { + if (null == mArea4List || mArea4List.size() <= 0) { + getStreetList(); + } else { + mArea4Picker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + StreetBean bean = mArea4List.get(options1); + mTvStreet.setText(bean.getName()); + mSelArea4 = bean; + + mSelArea5 = null; + mTvCommunity.setText(""); + mArea5List = null; + + mSelCommunity = null; + mCommunityList = null; + mTvCommunityArea.setText(""); + + mSelBuilding = null; + mBuildingList = null; + mTvBuilding.setText(""); + + mSelUnit = null; + mTvUnit.setText(""); + + mSelFloor = null; + mTvFloor.setText(""); + + }) + .setTitleText("请选择区域") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mArea4Picker.setPicker(mArea4List); + mArea4Picker.show(); + } + } + + /** + * 获取街道 + */ + private void getStreetList() { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getStreetList(UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List streetBeans) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + if (streetBeans != null && streetBeans.size() > 0) { + mArea4List = streetBeans; + onShowArea4(); + } else { + ToastUtils.showShort("暂无街道数据"); + } + } + + @Override + public void onError(Throwable e) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * area5 + */ + private void onShowArea5() { + if (null == mArea5List || mArea5List.size() <= 0) { + if (mSelArea4 == null) { + ToastUtils.showShort("请选择乡镇街道"); + } else { + getCommunity(mSelArea4.getId()); + } + } else { + mArea5Picker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + CommunityBean bean = mArea5List.get(options1); + mTvCommunity.setText(bean.getCommunityName()); + mSelArea5 = bean; + + mSelCommunity = null; + mCommunityList = null; + mTvCommunityArea.setText(""); + + mSelBuilding = null; + mBuildingList = null; + mTvBuilding.setText(""); + + mSelUnit = null; + mTvUnit.setText(""); + + mSelFloor = null; + mTvFloor.setText(""); + }) + .setTitleText("请选择社区") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mArea5Picker.setPicker(mArea5List); + mArea5Picker.show(); + } + } + + private void getCommunity(String areaId) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getCommunityDicList(areaId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List communityBeans) { + dialog.dismiss(); + if (null != communityBeans && communityBeans.size() > 0) { + mArea5List = communityBeans; + onShowArea5(); + } else { + ToastUtils.showShort("暂无社区数据"); + } + + } + + @Override + public void onError(Throwable e) { + dialog.dismiss(); + ToastUtils.showShort("获取区域失败"); + } + + @Override + public void onComplete() { + + } + }); + } + + + /** + * 小区选择 + */ + private void onShowCommunity() { + if (mSelArea5 == null) { + ToastUtils.showShort("请选择所在社区"); + } else { + if (mCommunityList == null) { + getAllCommunity(mSelArea5.getCommunityId()); + } else { + mCommunityPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelCommunity = mCommunityList.get(options1); + mTvCommunityArea.setText(mSelCommunity.getName()); + + mSelBuilding = null; + mBuildingList = null; + mTvBuilding.setText(""); + + mSelUnit = null; + mTvUnit.setText(""); + + mSelFloor = null; + mTvFloor.setText(""); + + }) + .setTitleText("请选择小区") + .isDialog(false) + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mCommunityPicker.setPicker(mCommunityList); + mCommunityPicker.show(); + } + } + + } + + /** + * 社区下全部小区 + * + * @param id + */ + private void getAllCommunity(String id) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getNewCommunityListAll(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List newCommunityDetailBeans) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + if (newCommunityDetailBeans != null && newCommunityDetailBeans.size() > 0) { + mCommunityList = newCommunityDetailBeans; + onShowCommunity(); + } else { + ToastUtils.showShort("所选社区下暂无小区"); + } + } + + @Override + public void onError(Throwable e) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + + /** + * 房屋详情 + * + * @param rowsBean + */ + private void showDetail(HousePersonBean.RowsBean rowsBean) { + Intent intent = new Intent(); + intent.putExtra("id", rowsBean.getHouseDTO().getHouseId()); + intent.setClass(mActivity, NewHouseDetailActivity.class); + startActivityForResult(intent, 1234); + } + + // 加载更多 + private void loadMore() { + doSearchPersonByHouse(mCurPage); + } + + /** + * 刷新数据 + */ + private void refreshData() { + mCurPage = 1; + doSearchPersonByHouse(mCurPage); + } + + /** + * + */ + private void doSearch() { + mDatas.clear(); + mAdapter.setData(mDatas); + mCsvState.setState(CustomStateView.STATE_LOAD); + mCurPage = 1; + doSearchPersonByHouse(mCurPage); + boolean isExpand = mElvContent.getIsExpand(); + if (isExpand) { + mElvContent.toggle(); + } + } + + + /** + * 进行搜索 + */ + private void doSearchPersonByHouse(int page) { + mCurPage = page; + String streetID = mSelArea4 == null ? "" : mSelArea4.getId(); + String communityID = mSelArea5 == null ? "" : mSelArea5.getCommunityId(); + String communityAreaId = mSelCommunity == null ? "" : mSelCommunity.getResidentialId(); + String buildingId = mSelBuilding == null ? "" : mSelBuilding.getBuildingId(); + String unitId = mSelUnit == null ? "" : mSelUnit.getDictionaryName(); + String floorId = mSelFloor == null ? "" : mSelFloor.getDictionaryName(); + String roomNum = mEtRoom.getText().toString().trim(); + String isHire = mSwIsHire.isChecked() ? "1" : "0"; + String isEmpty = mSwIsHire.isChecked() ? "1" : "0"; + RetrofitManager.getInstance() + .create(LocationApiService.class) + .doSearchPersonByHouseV3("" + page, + streetID, + communityID, + communityAreaId, + buildingId, + unitId, + floorId, + roomNum, + isHire, + isEmpty, + UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(HousePersonBean leaveListBean) { + if (leaveListBean != null && leaveListBean.getRows().size() > 0) { + ++mCurPage; + if (page == 1) { + mDatas.clear(); + mDatas.addAll(leaveListBean.getRows()); + } else { + mDatas.addAll(leaveListBean.getRows()); + } + setStateView(14); + mAdapter.notifyDataSetChanged(); + mRlvItems.refreshComplete(); + if (mDatas.size() >= leaveListBean.getTotal()) { + mRlvItems.loadMoreComplete(); + mRlvItems.setNoMore(true); + } else { + mRlvItems.loadMoreComplete(); + mRlvItems.setNoMore(false); + } + } else { + if (page > 1) { + mRlvItems.loadMoreComplete(); + mRlvItems.setNoMore(true); + setStateView(14); + } else { + setStateView(15); + } + } + } + + @Override + public void onError(Throwable e) { + setStateView(16); + mRlvItems.refreshComplete(); + mRlvItems.loadMoreComplete(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 根据状态显示 + * 12 默认 + * 13 搜索中 + * 14 搜索完成有数据 + * 15 搜索完成没有数据 + * 16 搜索失败 + * + * @param state + */ + private void setStateView(int state) { + switch (state) { + case 12://默认 + mRlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_SEARCH); + break; + case 13://搜索中 + mRlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_LOAD); + break; + case 14://搜索完成有数据 + mRlvItems.setVisibility(View.VISIBLE); + mCsvState.setState(CustomStateView.STATE_SUCCESS); + break; + case 15://搜索完成没有数据 + mRlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_EMPTY); + break; + case 16://搜索失败 + mRlvItems.setVisibility(View.GONE); + mCsvState.setState(CustomStateView.STATE_ERROR); + break; + } + } + +} \ No newline at end of file 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 fa0960b..9e5ad14 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 @@ -132,6 +132,9 @@ public class NewGroupHouseAddActivity extends BaseActivity { private List mCommunityList; private OptionsPickerView mCommunityPicker; private NewCommunityDetailBean mSelCommunity; + private NewBuildingBean.RowsBean mSelBuilding; + private List mBuildingList; + private OptionsPickerView mBuildingPicker; private List mUnitList; private List mFloorList; @@ -139,9 +142,7 @@ public class NewGroupHouseAddActivity extends BaseActivity { private DicBean mSelFloor; private OptionsPickerView mUnitPicker; private OptionsPickerView mFloorPicker; - private NewBuildingBean.RowsBean mSelBuilding; - private List mBuildingList; - private OptionsPickerView mBuildingPicker; + private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private String mId = ""; private DicBean mSelHouseFrame; @@ -562,6 +563,7 @@ public class NewGroupHouseAddActivity extends BaseActivity { ToastUtils.showShort("请选择楼/排"); return false; } + List data = mUnitAdapter.getData(); for (int i = 0; i < data.size(); i++) { if (TextUtils.isEmpty(data.get(i).getUnitValue())) { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHouseAdapter.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHouseAdapter.java new file mode 100644 index 0000000..067c0ea --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHouseAdapter.java @@ -0,0 +1,78 @@ +package com.sucstepsoft.realtimelocation.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.beloo.widget.chipslayoutmanager.ChipsLayoutManager; +import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; +import com.sucstepsoft.realtimelocation.R; +import com.sucstepsoft.realtimelocation.adapters.holders.NewHousePersonHolder; +import com.sucstepsoft.realtimelocation.beans.HousePersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 楼宇 + */ +public class NewSearchHouseAdapter extends BaseRecyclerAdapter { + + private int mType = 1; + + public NewSearchHouseAdapter(Context ctx, List list) { + super(ctx, list); + } + + public NewSearchHouseAdapter(Context ctx, List list, int type) { + super(ctx, list); + this.mType = type; + } + + + @Override + public NewHousePersonHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_house_person, parent, false); + return new NewHousePersonHolder(itemView); + } + + @Override + public void bindHolder(NewHousePersonHolder h, int i) { + HousePersonBean.RowsBean bean = mData.get(i); + if (mType == 1) { + //以人找房 + h.mTvAreaName.setText(bean.getHouseDTO().getStreetName()); + h.mTvDistrictName.setText(bean.getHouseDTO().getBuildingName() + "(" + bean.getHouseDTO().getHouseNum() + ")"); + h.mTvCommunityName.setText(bean.getHouseDTO().getCommunityName()); + h.mTvBuilding.setVisibility(View.GONE); + h.mTvUnit.setVisibility(View.VISIBLE); + h.mTvUnit.setText(bean.getHouseDTO().getResidentialName()); + PersonInHouseAdapter adapter = new PersonInHouseAdapter(mContext, bean.getHouseDTO().getPopulationDTOList()); + ChipsLayoutManager chipsLayoutManager = ChipsLayoutManager.newBuilder(mContext) + .setOrientation(ChipsLayoutManager.HORIZONTAL) + .build(); + h.mRlvPerson.setLayoutManager(chipsLayoutManager); + h.mRlvPerson.setAdapter(adapter); + } else { + //以房找人 + h.mTvDistrictName.setText(bean.getName());//人名 + h.mTvAreaName.setText(bean.getCardNum());//证件号码 + h.mTvCommunityName.setText(bean.getPhone());//联系电话 + List datas = new ArrayList(); + if(bean.getHouseDTO() != null){ + datas.add(bean.getHouseDTO()); + PersonInHouseAdapter adapter = new PersonInHouseAdapter(mContext, datas); + ChipsLayoutManager chipsLayoutManager = ChipsLayoutManager.newBuilder(mContext) + .setOrientation(ChipsLayoutManager.HORIZONTAL) + .build(); + h.mRlvPerson.setLayoutManager(chipsLayoutManager); + h.mRlvPerson.setAdapter(adapter); + } + } + } + +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHousePersonAdapter.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHousePersonAdapter.java new file mode 100644 index 0000000..85ff0b6 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewSearchHousePersonAdapter.java @@ -0,0 +1,62 @@ +package com.sucstepsoft.realtimelocation.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.beloo.widget.chipslayoutmanager.ChipsLayoutManager; +import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; +import com.sucstepsoft.cm_utils.utils.DesensitizationUtil; +import com.sucstepsoft.realtimelocation.R; +import com.sucstepsoft.realtimelocation.adapters.holders.NewHousePersonByHolder; +import com.sucstepsoft.realtimelocation.beans.HousePersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 楼宇 + */ +public class NewSearchHousePersonAdapter extends BaseRecyclerAdapter { + + private int mType = 1; + + public NewSearchHousePersonAdapter(Context ctx, List list) { + super(ctx, list); + } + + public NewSearchHousePersonAdapter(Context ctx, List list, int type) { + super(ctx, list); + this.mType = type; + } + + + @Override + public NewHousePersonByHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_search_house_by_person, parent, false); + return new NewHousePersonByHolder(itemView); + } + + @Override + public void bindHolder(NewHousePersonByHolder h, int i) { + HousePersonBean.RowsBean bean = mData.get(i); + h.mTvName.setText(bean.getName());//人名 + h.mTvCard.setText("证件号码:" + DesensitizationUtil.idCardNum(bean.getCardNum()));//证件号码 + h.mTvPhone.setText("联系电话:" + DesensitizationUtil.mobilePhone(bean.getPhone()));//联系电话 + List datas = new ArrayList(); + if (bean.getHouseDTO() != null) { + datas.add(bean.getHouseDTO()); + PersonInHouseAdapter adapter = new PersonInHouseAdapter(mContext, datas); + ChipsLayoutManager chipsLayoutManager = ChipsLayoutManager.newBuilder(mContext) + .setOrientation(ChipsLayoutManager.HORIZONTAL) + .build(); + h.mRlvPerson.setLayoutManager(chipsLayoutManager); + h.mRlvPerson.setAdapter(adapter); + } + } + +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/PersonInHouseAdapter.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/PersonInHouseAdapter.java new file mode 100644 index 0000000..bac7306 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/PersonInHouseAdapter.java @@ -0,0 +1,49 @@ +package com.sucstepsoft.realtimelocation.adapters; + +import android.content.Context; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; +import com.sucstepsoft.realtimelocation.R; +import com.sucstepsoft.realtimelocation.adapters.holders.PersonInHouseHolder; +import com.sucstepsoft.realtimelocation.beans.HousePersonBean; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/24 - 9:16 AM + * 邮箱: itgaojian@163.com + * 描述: 房屋中的人 + */ +public class PersonInHouseAdapter extends BaseRecyclerAdapter { + + public PersonInHouseAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public PersonInHouseHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person_list, parent, false); + return new PersonInHouseHolder(itemView); + } + + @Override + public void bindHolder(PersonInHouseHolder h, int i) { + if (mData.get(i) instanceof HousePersonBean.RowsBean.HouseDTOBean.PopulationDTOListBean) { + //以人找房 + HousePersonBean.RowsBean.HouseDTOBean.PopulationDTOListBean bean = (HousePersonBean.RowsBean.HouseDTOBean.PopulationDTOListBean) mData.get(i); + h.mTvPerson.setText(bean.getName()); + } else { + //以房找人 + HousePersonBean.RowsBean.HouseDTOBean b = (HousePersonBean.RowsBean.HouseDTOBean) mData.get(i); + h.mTvPerson.setText(b.getStreetName() + "/" + b.getCommunityName() + "/" + b.getResidentialName() + "/" + b.getUnitNum() + "(单元/列)/" + b.getFloorsNum() + "(层/院)/" + b.getBuildingName() + "/" + b.getHouseNum()); + h.mTvPerson.setGravity(Gravity.LEFT); + } + } + + +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonByHolder.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonByHolder.java new file mode 100644 index 0000000..8be8c87 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonByHolder.java @@ -0,0 +1,32 @@ +package com.sucstepsoft.realtimelocation.adapters.holders; + +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.sucstepsoft.realtimelocation.R; + +/** + * 作者: adam + * 日期: 2021/7/9 - 3:22 下午 + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewHousePersonByHolder extends RecyclerView.ViewHolder { + public TextView mTvName; + public TextView mTvPhone; + public TextView mTvCard; + public RecyclerView mRlvPerson; + + public View mVLine; + + public NewHousePersonByHolder(@NonNull View itemView) { + super(itemView); + mTvName = itemView.findViewById(R.id.tv_name); + mTvPhone = itemView.findViewById(R.id.tv_phone); + mTvCard = itemView.findViewById(R.id.tv_card); + mVLine = itemView.findViewById(R.id.v_line); + mRlvPerson = itemView.findViewById(R.id.rlv_person); + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonHolder.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonHolder.java new file mode 100644 index 0000000..8a93ff3 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHousePersonHolder.java @@ -0,0 +1,37 @@ +package com.sucstepsoft.realtimelocation.adapters.holders; + +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import com.sucstepsoft.realtimelocation.R; + +/** + * 作者: adam + * 日期: 2021/7/9 - 3:22 下午 + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewHousePersonHolder extends RecyclerView.ViewHolder { + public TextView mTvAreaName;//街道名称 + public TextView mTvCommunityName;//社区名称 + public TextView mTvDistrictName;//小区名称 + public TextView mTvUnit;//小区 + public TextView mTvBuilding; + public RecyclerView mRlvPerson; + + public View mVLine; + + public NewHousePersonHolder(@NonNull View itemView) { + super(itemView); + mTvAreaName = itemView.findViewById(R.id.tv_area); + mTvCommunityName = itemView.findViewById(R.id.tv_community); + mTvDistrictName = itemView.findViewById(R.id.tv_district); + mTvUnit = itemView.findViewById(R.id.tv_unit); + mTvBuilding = itemView.findViewById(R.id.tv_building); + mVLine = itemView.findViewById(R.id.v_line); + mRlvPerson = itemView.findViewById(R.id.rlv_person); + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/PersonInHouseHolder.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/PersonInHouseHolder.java new file mode 100644 index 0000000..bdb5087 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/PersonInHouseHolder.java @@ -0,0 +1,23 @@ +package com.sucstepsoft.realtimelocation.adapters.holders; + +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.sucstepsoft.realtimelocation.R; + +/** + * 作者: adam + * 日期: 2021/7/9 - 3:22 下午 + * 邮箱: itgaojian@163.com + * 描述: + */ +public class PersonInHouseHolder extends RecyclerView.ViewHolder { + public TextView mTvPerson; + + public PersonInHouseHolder(@NonNull View itemView) { + super(itemView); + mTvPerson = itemView.findViewById(R.id.tv_person); + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/HousePersonBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/HousePersonBean.java new file mode 100644 index 0000000..c7334ee --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/HousePersonBean.java @@ -0,0 +1,1549 @@ +package com.sucstepsoft.realtimelocation.beans; + +import java.util.List; + +public class HousePersonBean { + + private List rows; + private int page; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String populationId; + private String houseId; + private String populationInfoId; + private String name; + private String cardNum; + private String phone; + private String bindTime; + private String outHouse; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private int isDelete; + private HouseDTOBean houseDTO; + private Object populationInfoHouseDTO; + private PopulationInfoDTOBean populationInfoDTO; + + public String getPopulationId() { + return populationId; + } + + public void setPopulationId(String populationId) { + this.populationId = populationId; + } + + public String getHouseId() { + return houseId; + } + + public void setHouseId(String houseId) { + this.houseId = houseId; + } + + public String getPopulationInfoId() { + return populationInfoId; + } + + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getBindTime() { + return bindTime; + } + + public void setBindTime(String bindTime) { + this.bindTime = bindTime; + } + + public String getOutHouse() { + return outHouse; + } + + public void setOutHouse(String outHouse) { + this.outHouse = outHouse; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified; + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public int getIsDelete() { + return isDelete; + } + + public void setIsDelete(int isDelete) { + this.isDelete = isDelete; + } + + public HouseDTOBean getHouseDTO() { + return houseDTO; + } + + public void setHouseDTO(HouseDTOBean houseDTO) { + this.houseDTO = houseDTO; + } + + public Object getPopulationInfoHouseDTO() { + return populationInfoHouseDTO; + } + + public void setPopulationInfoHouseDTO(Object populationInfoHouseDTO) { + this.populationInfoHouseDTO = populationInfoHouseDTO; + } + + public PopulationInfoDTOBean getPopulationInfoDTO() { + return populationInfoDTO; + } + + public void setPopulationInfoDTO(PopulationInfoDTOBean populationInfoDTO) { + this.populationInfoDTO = populationInfoDTO; + } + + public static class HouseDTOBean { + private String houseId; + private String community; + private String communityName; + private String residentialId; + private String residentialName; + private String buildingId; + private String buildingName; + private String affiliationUnit; + private String unitNum; + private String affiliationFloors; + private String floorsNum; + private String houseNum; + private String categoryId; + private String categoryName; + private String natureId; + private String natureName; + private String typeId; + private String typeName; + private String structureId; + private String structureName; + private String buildingPurposeId; + private String buildingPurposeName; + private int roomNum; + private String roomArea; + private String roomUseId; + private String roomUseName; + private String dangerId; + private String dangerName; + private String certificateNum; + private String registrationDate; + private String affiliatedUnit; + private int isRental; + private int isVacant; + private String lodgeTypeId; + private String lodgeTypeName; + private String rentalPurposes; + private String homeowner; + private String documentId; + private String documentName; + private String documentNum; + private String phone; + private String custodian; + private String custodianDocumentId; + private String custodianDocumentName; + private String custodianDocumentNum; + private String custodianPhone; + private String relationshipHomeowner; + private String creator; + private Object gmtCreate; + private Object modifier; + private Object gmtModified; + private Object isDelete; + private String street; + private String streetName; + private String houseType; + private List populationDTOList; + + public String getHouseId() { + return houseId; + } + + public void setHouseId(String houseId) { + this.houseId = houseId; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getCommunityName() { + return communityName; + } + + public void setCommunityName(String communityName) { + this.communityName = communityName; + } + + public String getResidentialId() { + return residentialId; + } + + public void setResidentialId(String residentialId) { + this.residentialId = residentialId; + } + + public String getResidentialName() { + return residentialName; + } + + public void setResidentialName(String residentialName) { + this.residentialName = residentialName; + } + + public String getBuildingId() { + return buildingId; + } + + public void setBuildingId(String buildingId) { + this.buildingId = buildingId; + } + + public String getBuildingName() { + return buildingName; + } + + public void setBuildingName(String buildingName) { + this.buildingName = buildingName; + } + + public String getAffiliationUnit() { + return affiliationUnit; + } + + public void setAffiliationUnit(String affiliationUnit) { + this.affiliationUnit = affiliationUnit; + } + + public String getUnitNum() { + return unitNum; + } + + public void setUnitNum(String unitNum) { + this.unitNum = unitNum; + } + + public String getAffiliationFloors() { + return affiliationFloors; + } + + public void setAffiliationFloors(String affiliationFloors) { + this.affiliationFloors = affiliationFloors; + } + + public String getFloorsNum() { + return floorsNum; + } + + public void setFloorsNum(String floorsNum) { + this.floorsNum = floorsNum; + } + + public String getHouseNum() { + return houseNum; + } + + public void setHouseNum(String houseNum) { + this.houseNum = houseNum; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public String getNatureId() { + return natureId; + } + + public void setNatureId(String natureId) { + this.natureId = natureId; + } + + public String getNatureName() { + return natureName; + } + + public void setNatureName(String natureName) { + this.natureName = natureName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getStructureId() { + return structureId; + } + + public void setStructureId(String structureId) { + this.structureId = structureId; + } + + public String getStructureName() { + return structureName; + } + + public void setStructureName(String structureName) { + this.structureName = structureName; + } + + public String getBuildingPurposeId() { + return buildingPurposeId; + } + + public void setBuildingPurposeId(String buildingPurposeId) { + this.buildingPurposeId = buildingPurposeId; + } + + public String getBuildingPurposeName() { + return buildingPurposeName; + } + + public void setBuildingPurposeName(String buildingPurposeName) { + this.buildingPurposeName = buildingPurposeName; + } + + public int getRoomNum() { + return roomNum; + } + + public void setRoomNum(int roomNum) { + this.roomNum = roomNum; + } + + public String getRoomArea() { + return roomArea; + } + + public void setRoomArea(String roomArea) { + this.roomArea = roomArea; + } + + public String getRoomUseId() { + return roomUseId; + } + + public void setRoomUseId(String roomUseId) { + this.roomUseId = roomUseId; + } + + public String getRoomUseName() { + return roomUseName; + } + + public void setRoomUseName(String roomUseName) { + this.roomUseName = roomUseName; + } + + public String getDangerId() { + return dangerId; + } + + public void setDangerId(String dangerId) { + this.dangerId = dangerId; + } + + public String getDangerName() { + return dangerName; + } + + public void setDangerName(String dangerName) { + this.dangerName = dangerName; + } + + public String getCertificateNum() { + return certificateNum; + } + + public void setCertificateNum(String certificateNum) { + this.certificateNum = certificateNum; + } + + public String getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(String registrationDate) { + this.registrationDate = registrationDate; + } + + public String getAffiliatedUnit() { + return affiliatedUnit; + } + + public void setAffiliatedUnit(String affiliatedUnit) { + this.affiliatedUnit = affiliatedUnit; + } + + public int getIsRental() { + return isRental; + } + + public void setIsRental(int isRental) { + this.isRental = isRental; + } + + public int getIsVacant() { + return isVacant; + } + + public void setIsVacant(int isVacant) { + this.isVacant = isVacant; + } + + public String getLodgeTypeId() { + return lodgeTypeId; + } + + public void setLodgeTypeId(String lodgeTypeId) { + this.lodgeTypeId = lodgeTypeId; + } + + public String getLodgeTypeName() { + return lodgeTypeName; + } + + public void setLodgeTypeName(String lodgeTypeName) { + this.lodgeTypeName = lodgeTypeName; + } + + public String getRentalPurposes() { + return rentalPurposes; + } + + public void setRentalPurposes(String rentalPurposes) { + this.rentalPurposes = rentalPurposes; + } + + public String getHomeowner() { + return homeowner; + } + + public void setHomeowner(String homeowner) { + this.homeowner = homeowner; + } + + public String getDocumentId() { + return documentId; + } + + public void setDocumentId(String documentId) { + this.documentId = documentId; + } + + public String getDocumentName() { + return documentName; + } + + public void setDocumentName(String documentName) { + this.documentName = documentName; + } + + public String getDocumentNum() { + return documentNum; + } + + public void setDocumentNum(String documentNum) { + this.documentNum = documentNum; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getCustodian() { + return custodian; + } + + public void setCustodian(String custodian) { + this.custodian = custodian; + } + + public String getCustodianDocumentId() { + return custodianDocumentId; + } + + public void setCustodianDocumentId(String custodianDocumentId) { + this.custodianDocumentId = custodianDocumentId; + } + + public String getCustodianDocumentName() { + return custodianDocumentName; + } + + public void setCustodianDocumentName(String custodianDocumentName) { + this.custodianDocumentName = custodianDocumentName; + } + + public String getCustodianDocumentNum() { + return custodianDocumentNum; + } + + public void setCustodianDocumentNum(String custodianDocumentNum) { + this.custodianDocumentNum = custodianDocumentNum; + } + + public String getCustodianPhone() { + return custodianPhone; + } + + public void setCustodianPhone(String custodianPhone) { + this.custodianPhone = custodianPhone; + } + + public String getRelationshipHomeowner() { + return relationshipHomeowner; + } + + public void setRelationshipHomeowner(String relationshipHomeowner) { + this.relationshipHomeowner = relationshipHomeowner; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Object getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(Object gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Object getModifier() { + return modifier; + } + + public void setModifier(Object modifier) { + this.modifier = modifier; + } + + public Object getGmtModified() { + return gmtModified; + } + + public void setGmtModified(Object gmtModified) { + this.gmtModified = gmtModified; + } + + public Object getIsDelete() { + return isDelete; + } + + public void setIsDelete(Object isDelete) { + this.isDelete = isDelete; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetName() { + return streetName; + } + + public void setStreetName(String streetName) { + this.streetName = streetName; + } + + public String getHouseType() { + return houseType; + } + + public void setHouseType(String houseType) { + this.houseType = houseType; + } + + public List getPopulationDTOList() { + return populationDTOList; + } + + public void setPopulationDTOList(List populationDTOList) { + this.populationDTOList = populationDTOList; + } + + public static class PopulationDTOListBean { + private String populationId; + private String houseId; + private String populationInfoId; + private String name; + private String cardNum; + private String phone; + private String bindTime; + private String outHouse; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private int isDelete; + private Object houseDTO; + private Object populationInfoHouseDTO; + private Object populationInfoDTO; + + public String getPopulationId() { + return populationId; + } + + public void setPopulationId(String populationId) { + this.populationId = populationId; + } + + public String getHouseId() { + return houseId; + } + + public void setHouseId(String houseId) { + this.houseId = houseId; + } + + public String getPopulationInfoId() { + return populationInfoId; + } + + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getBindTime() { + return bindTime; + } + + public void setBindTime(String bindTime) { + this.bindTime = bindTime; + } + + public String getOutHouse() { + return outHouse; + } + + public void setOutHouse(String outHouse) { + this.outHouse = outHouse; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified; + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public int getIsDelete() { + return isDelete; + } + + public void setIsDelete(int isDelete) { + this.isDelete = isDelete; + } + + public Object getHouseDTO() { + return houseDTO; + } + + public void setHouseDTO(Object houseDTO) { + this.houseDTO = houseDTO; + } + + public Object getPopulationInfoHouseDTO() { + return populationInfoHouseDTO; + } + + public void setPopulationInfoHouseDTO(Object populationInfoHouseDTO) { + this.populationInfoHouseDTO = populationInfoHouseDTO; + } + + public Object getPopulationInfoDTO() { + return populationInfoDTO; + } + + public void setPopulationInfoDTO(Object populationInfoDTO) { + this.populationInfoDTO = populationInfoDTO; + } + } + } + + public static class PopulationInfoDTOBean { + private String populationInfoId; + private String name; + private Object label; + private List labelList; + private String idcard; + private String idcardType; + private String birthday; + private String sex; + private String nation; + private String education; + private String description; + private String organization; + private String religion; + private String marriageStatus; + private String marriageChangeTime; + private String marriageFirstTime; + private String socialSecurity; + private String healthStatus; + private String department; + private String pastion; + private String pastionTitle; + private String expertise; + private String phone; + private String fatherId; + private String fatherName; + private String fatherIdcard; + private String fatherPhone; + private String motherId; + private String motherName; + private String motherIdcard; + private String motherPhone; + private String relationship; + private String domicileAddress; + private String domicileAddressType; + private String domicileAreaCode; + private String domicileAreaName; + private String originAddress; + private String originAreaCode; + private String originAreaName; + private String flowTime; + private String flowReason; + private String flowReasontext; + private String isOldage; + private String oldageType; + private String oldageDepartment; + private String oldageLift; + private String oldageHealthStatus; + private String oldageSelfcare; + private String oldageLive; + private String isDisability; + private String disabilityType; + private String disabilityLevel; + private String disabilityNumber; + private String disabilityCarnumber; + private String disabilityAddress; + private String disabilityAreaCode; + private String disabilityAreaName; + private String disabilityIncome; + private String disabilityHouse; + private String disabilityTime; + private String disabilityGuardian; + private String disabilityGuardianPhone; + private String disabilityGuardianRelation; + private String isMilitary; + private String militaryTime; + private String militaryPosition; + private String isSuccour; + private String succourDibao; + private String succourHelp; + private String succourDifficulty; + private String succourSubsidy; + private String isParty; + private String partyOrganization; + private String partyTime; + private String othertext; + private String departmentType; + private Object age; + private String creator; + private Object creatorName; + + public String getPopulationInfoId() { + return populationInfoId; + } + + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Object getLabel() { + return label; + } + + public void setLabel(Object label) { + this.label = label; + } + + public List getLabelList() { + return labelList; + } + + public void setLabelList(List labelList) { + this.labelList = labelList; + } + + public String getIdcard() { + return idcard; + } + + public void setIdcard(String idcard) { + this.idcard = idcard; + } + + public String getIdcardType() { + return idcardType; + } + + public void setIdcardType(String idcardType) { + this.idcardType = idcardType; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getOrganization() { + return organization; + } + + public void setOrganization(String organization) { + this.organization = organization; + } + + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getMarriageStatus() { + return marriageStatus; + } + + public void setMarriageStatus(String marriageStatus) { + this.marriageStatus = marriageStatus; + } + + public String getMarriageChangeTime() { + return marriageChangeTime; + } + + public void setMarriageChangeTime(String marriageChangeTime) { + this.marriageChangeTime = marriageChangeTime; + } + + public String getMarriageFirstTime() { + return marriageFirstTime; + } + + public void setMarriageFirstTime(String marriageFirstTime) { + this.marriageFirstTime = marriageFirstTime; + } + + public String getSocialSecurity() { + return socialSecurity; + } + + public void setSocialSecurity(String socialSecurity) { + this.socialSecurity = socialSecurity; + } + + public String getHealthStatus() { + return healthStatus; + } + + public void setHealthStatus(String healthStatus) { + this.healthStatus = healthStatus; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPastion() { + return pastion; + } + + public void setPastion(String pastion) { + this.pastion = pastion; + } + + public String getPastionTitle() { + return pastionTitle; + } + + public void setPastionTitle(String pastionTitle) { + this.pastionTitle = pastionTitle; + } + + public String getExpertise() { + return expertise; + } + + public void setExpertise(String expertise) { + this.expertise = expertise; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getFatherId() { + return fatherId; + } + + public void setFatherId(String fatherId) { + this.fatherId = fatherId; + } + + public String getFatherName() { + return fatherName; + } + + public void setFatherName(String fatherName) { + this.fatherName = fatherName; + } + + public String getFatherIdcard() { + return fatherIdcard; + } + + public void setFatherIdcard(String fatherIdcard) { + this.fatherIdcard = fatherIdcard; + } + + public String getFatherPhone() { + return fatherPhone; + } + + public void setFatherPhone(String fatherPhone) { + this.fatherPhone = fatherPhone; + } + + public String getMotherId() { + return motherId; + } + + public void setMotherId(String motherId) { + this.motherId = motherId; + } + + public String getMotherName() { + return motherName; + } + + public void setMotherName(String motherName) { + this.motherName = motherName; + } + + public String getMotherIdcard() { + return motherIdcard; + } + + public void setMotherIdcard(String motherIdcard) { + this.motherIdcard = motherIdcard; + } + + public String getMotherPhone() { + return motherPhone; + } + + public void setMotherPhone(String motherPhone) { + this.motherPhone = motherPhone; + } + + public String getRelationship() { + return relationship; + } + + public void setRelationship(String relationship) { + this.relationship = relationship; + } + + public String getDomicileAddress() { + return domicileAddress; + } + + public void setDomicileAddress(String domicileAddress) { + this.domicileAddress = domicileAddress; + } + + public String getDomicileAddressType() { + return domicileAddressType; + } + + public void setDomicileAddressType(String domicileAddressType) { + this.domicileAddressType = domicileAddressType; + } + + public String getDomicileAreaCode() { + return domicileAreaCode; + } + + public void setDomicileAreaCode(String domicileAreaCode) { + this.domicileAreaCode = domicileAreaCode; + } + + public String getDomicileAreaName() { + return domicileAreaName; + } + + public void setDomicileAreaName(String domicileAreaName) { + this.domicileAreaName = domicileAreaName; + } + + public String getOriginAddress() { + return originAddress; + } + + public void setOriginAddress(String originAddress) { + this.originAddress = originAddress; + } + + public String getOriginAreaCode() { + return originAreaCode; + } + + public void setOriginAreaCode(String originAreaCode) { + this.originAreaCode = originAreaCode; + } + + public String getOriginAreaName() { + return originAreaName; + } + + public void setOriginAreaName(String originAreaName) { + this.originAreaName = originAreaName; + } + + public String getFlowTime() { + return flowTime; + } + + public void setFlowTime(String flowTime) { + this.flowTime = flowTime; + } + + public String getFlowReason() { + return flowReason; + } + + public void setFlowReason(String flowReason) { + this.flowReason = flowReason; + } + + public String getFlowReasontext() { + return flowReasontext; + } + + public void setFlowReasontext(String flowReasontext) { + this.flowReasontext = flowReasontext; + } + + public String getIsOldage() { + return isOldage; + } + + public void setIsOldage(String isOldage) { + this.isOldage = isOldage; + } + + public String getOldageType() { + return oldageType; + } + + public void setOldageType(String oldageType) { + this.oldageType = oldageType; + } + + public String getOldageDepartment() { + return oldageDepartment; + } + + public void setOldageDepartment(String oldageDepartment) { + this.oldageDepartment = oldageDepartment; + } + + public String getOldageLift() { + return oldageLift; + } + + public void setOldageLift(String oldageLift) { + this.oldageLift = oldageLift; + } + + public String getOldageHealthStatus() { + return oldageHealthStatus; + } + + public void setOldageHealthStatus(String oldageHealthStatus) { + this.oldageHealthStatus = oldageHealthStatus; + } + + public String getOldageSelfcare() { + return oldageSelfcare; + } + + public void setOldageSelfcare(String oldageSelfcare) { + this.oldageSelfcare = oldageSelfcare; + } + + public String getOldageLive() { + return oldageLive; + } + + public void setOldageLive(String oldageLive) { + this.oldageLive = oldageLive; + } + + public String getIsDisability() { + return isDisability; + } + + public void setIsDisability(String isDisability) { + this.isDisability = isDisability; + } + + public String getDisabilityType() { + return disabilityType; + } + + public void setDisabilityType(String disabilityType) { + this.disabilityType = disabilityType; + } + + public String getDisabilityLevel() { + return disabilityLevel; + } + + public void setDisabilityLevel(String disabilityLevel) { + this.disabilityLevel = disabilityLevel; + } + + public String getDisabilityNumber() { + return disabilityNumber; + } + + public void setDisabilityNumber(String disabilityNumber) { + this.disabilityNumber = disabilityNumber; + } + + public String getDisabilityCarnumber() { + return disabilityCarnumber; + } + + public void setDisabilityCarnumber(String disabilityCarnumber) { + this.disabilityCarnumber = disabilityCarnumber; + } + + public String getDisabilityAddress() { + return disabilityAddress; + } + + public void setDisabilityAddress(String disabilityAddress) { + this.disabilityAddress = disabilityAddress; + } + + public String getDisabilityAreaCode() { + return disabilityAreaCode; + } + + public void setDisabilityAreaCode(String disabilityAreaCode) { + this.disabilityAreaCode = disabilityAreaCode; + } + + public String getDisabilityAreaName() { + return disabilityAreaName; + } + + public void setDisabilityAreaName(String disabilityAreaName) { + this.disabilityAreaName = disabilityAreaName; + } + + public String getDisabilityIncome() { + return disabilityIncome; + } + + public void setDisabilityIncome(String disabilityIncome) { + this.disabilityIncome = disabilityIncome; + } + + public String getDisabilityHouse() { + return disabilityHouse; + } + + public void setDisabilityHouse(String disabilityHouse) { + this.disabilityHouse = disabilityHouse; + } + + public String getDisabilityTime() { + return disabilityTime; + } + + public void setDisabilityTime(String disabilityTime) { + this.disabilityTime = disabilityTime; + } + + public String getDisabilityGuardian() { + return disabilityGuardian; + } + + public void setDisabilityGuardian(String disabilityGuardian) { + this.disabilityGuardian = disabilityGuardian; + } + + public String getDisabilityGuardianPhone() { + return disabilityGuardianPhone; + } + + public void setDisabilityGuardianPhone(String disabilityGuardianPhone) { + this.disabilityGuardianPhone = disabilityGuardianPhone; + } + + public String getDisabilityGuardianRelation() { + return disabilityGuardianRelation; + } + + public void setDisabilityGuardianRelation(String disabilityGuardianRelation) { + this.disabilityGuardianRelation = disabilityGuardianRelation; + } + + public String getIsMilitary() { + return isMilitary; + } + + public void setIsMilitary(String isMilitary) { + this.isMilitary = isMilitary; + } + + public String getMilitaryTime() { + return militaryTime; + } + + public void setMilitaryTime(String militaryTime) { + this.militaryTime = militaryTime; + } + + public String getMilitaryPosition() { + return militaryPosition; + } + + public void setMilitaryPosition(String militaryPosition) { + this.militaryPosition = militaryPosition; + } + + public String getIsSuccour() { + return isSuccour; + } + + public void setIsSuccour(String isSuccour) { + this.isSuccour = isSuccour; + } + + public String getSuccourDibao() { + return succourDibao; + } + + public void setSuccourDibao(String succourDibao) { + this.succourDibao = succourDibao; + } + + public String getSuccourHelp() { + return succourHelp; + } + + public void setSuccourHelp(String succourHelp) { + this.succourHelp = succourHelp; + } + + public String getSuccourDifficulty() { + return succourDifficulty; + } + + public void setSuccourDifficulty(String succourDifficulty) { + this.succourDifficulty = succourDifficulty; + } + + public String getSuccourSubsidy() { + return succourSubsidy; + } + + public void setSuccourSubsidy(String succourSubsidy) { + this.succourSubsidy = succourSubsidy; + } + + public String getIsParty() { + return isParty; + } + + public void setIsParty(String isParty) { + this.isParty = isParty; + } + + public String getPartyOrganization() { + return partyOrganization; + } + + public void setPartyOrganization(String partyOrganization) { + this.partyOrganization = partyOrganization; + } + + public String getPartyTime() { + return partyTime; + } + + public void setPartyTime(String partyTime) { + this.partyTime = partyTime; + } + + public String getOthertext() { + return othertext; + } + + public void setOthertext(String othertext) { + this.othertext = othertext; + } + + public String getDepartmentType() { + return departmentType; + } + + public void setDepartmentType(String departmentType) { + this.departmentType = departmentType; + } + + public Object getAge() { + return age; + } + + public void setAge(Object age) { + this.age = age; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Object getCreatorName() { + return creatorName; + } + + public void setCreatorName(Object creatorName) { + this.creatorName = creatorName; + } + } + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java index 617ee4f..389a07c 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java @@ -20,6 +20,7 @@ import com.sucstepsoft.realtimelocation.beans.DicBean; import com.sucstepsoft.realtimelocation.beans.HireHouseBean; import com.sucstepsoft.realtimelocation.beans.HireHouseDetailBean; import com.sucstepsoft.realtimelocation.beans.HouseLivePersonBean; +import com.sucstepsoft.realtimelocation.beans.HousePersonBean; import com.sucstepsoft.realtimelocation.beans.HousePersonListBean; import com.sucstepsoft.realtimelocation.beans.IssueSubBean; import com.sucstepsoft.realtimelocation.beans.LeaveDetailBean; @@ -789,6 +790,30 @@ public interface LocationApiService { @GET("app/buildinghouseuser/list-find-house-by-people") Observable> doNewSearchHouseByPerson(@Query("keywords") String keywords, @Header("token") String token); + /** + * 新版以人找房 + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/population/findHouse") + Observable doSearchHouseByPersonV3(@Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + + /** + * 新版以房找人 + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/population/findPopulation") + Observable doSearchPersonByHouseV3(@Query("page") String page, + @Query("street") String street, + @Query("community") String community, + @Query("residentialId") String rId, + @Query("buildingId") String buildingId, + @Query("affiliationUnit") String unit, + @Query("affiliationFloors") String floor, + @Query("houseNum") String houseNum, + @Query("isRental") String isHire, + @Query("isVacant") String isEmpty, + @Header("token") String token); + // app/buildinghouse/listpage?keywords /** @@ -856,7 +881,6 @@ public interface LocationApiService { Observable doDelBaseRegister(@Path("ids") String id, @Header("token") String token); - /** * 详情 */ diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java b/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java index d7432bb..607544c 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java @@ -71,6 +71,10 @@ public class ExpandableLinearLayout extends LinearLayout implements View.OnClick findViews(); } + public boolean getIsExpand() { + return isExpand; + } + /** * 初始化底部view */ diff --git a/app/src/main/res/layout/activity_new_search_house_by_person.xml b/app/src/main/res/layout/activity_new_search_house_by_person.xml new file mode 100644 index 0000000..f31fd23 --- /dev/null +++ b/app/src/main/res/layout/activity_new_search_house_by_person.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_new_search_person_by_house.xml b/app/src/main/res/layout/activity_new_search_person_by_house.xml new file mode 100644 index 0000000..7f0137c --- /dev/null +++ b/app/src/main/res/layout/activity_new_search_person_by_house.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + +