房屋管理

app/src/main/AndroidManifest.xml

@@ -48,7 +48,11 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
-
+        <activity
+            android:name=".activitys.census.newhouse.activitys.NewHouseAddActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".activitys.census.newhouse.activitys.NewBuildingDetailActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/BuildingViewPageActivity.java

@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.core.widget.base.LazyFragment;
 import com.sucstepsoft.cm_utils.core.widget.xtablayout.XTabLayout;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.activitys.census.house.NewCommunityAddActivity;
@@ -37,7 +38,7 @@ public class BuildingViewPageActivity extends BaseActivity {
 
     private Unbinder mBind;
     private String[] mTitles = new String[]{"小区", "楼/排", "房屋", "出租房"};
-    private List<Fragment> mFragments = new ArrayList<>();
+    private List<LazyFragment> mFragments = new ArrayList<>();
 
     @Override
     protected int setLayoutId() {
@@ -75,25 +76,8 @@ public class BuildingViewPageActivity extends BaseActivity {
      */
     private void onAddPage() {
         int currentItem = mVpContent.getCurrentItem();
-        Intent intent = new Intent();
+        mFragments.get(currentItem).startAddActivity("");
-        switch (currentItem) {
-            case 0://小区
-                intent.setClass(mActivity, NewCommunityAddActivity.class);
-                intent.putExtra("title", "小区信息录入");
-                startActivityForResult(intent,123);
-                break;
-            case 1://楼宇
-                intent.setClass(mActivity, NewBuildingAddActivity.class);
-                intent.putExtra("title", "楼/排信息录入");
-                startActivityForResult(intent,123);
-                break;
-            case 2://房屋
 
-                break;
-            case 3://出租房
-
-                break;
-        }
     }
 
     @Override

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingAddActivity.java

@@ -453,9 +453,14 @@ public class NewBuildingAddActivity extends BaseActivity {
                 StreetBean bean = mArea4List.get(options1);
                 mTvStreet.setText(bean.getName());
                 mSelArea4 = bean;
+
                 mSelArea5 = null;
                 mTvCommunity.setText("");
                 mArea5List = null;
+
+                mCommunityList = null;
+                mSelCommunity = null;
+                mTvCommunityArea.setText("");
             })
                     .setTitleText("请选择区域")
                     .isDialog(false)
@@ -528,7 +533,10 @@ public class NewBuildingAddActivity extends BaseActivity {
                 CommunityBean bean = mArea5List.get(options1);
                 mTvCommunity.setText(bean.getCommunityName());
                 mSelArea5 = bean;
+
                 mCommunityList = null;
+                mSelCommunity = null;
+                mTvCommunityArea.setText("");
             })
                     .setTitleText("请选择社区")
                     .isDialog(false)

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewBuildingDetailActivity.java

@@ -96,9 +96,6 @@ public class NewBuildingDetailActivity extends BaseActivity {
     private LatLng mDefaultPoint;
     private BitmapDescriptor mBitmapDescriptor;
     private List<AddPhotoBean> mPhotos = new ArrayList<>();
-    private AddPhotoBean mCurrentBean;
-    private String mPicPath;
-    private String mPhotoIds = "";//相片Id
     private AddPhotoAdapter mPhotoAdapter;
     private String mId;
 

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/activitys/NewHouseDetailActivity.java

@@ -4,40 +4,29 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
+import android.widget.Switch;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.gson.Gson;
 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.CenterInputDialogView;
 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.adapters.NewHousePersonAdapter;
+import com.sucstepsoft.realtimelocation.beans.NewHouseDetailBean;
-import com.sucstepsoft.realtimelocation.beans.BuildHouseDetailBean;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
 
-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.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
 
 /**
  * 作者: Adam
@@ -46,33 +35,76 @@ import okhttp3.RequestBody;
  * 描述: 房屋详情
  */
 public class NewHouseDetailActivity extends BaseActivity {
-
+    @BindView(R.id.tv_street)
-
+    TextView mTvStreet;
-    @BindView(R.id.iv_del)
+    @BindView(R.id.tv_community)
-    ImageView mIvDel;
+    TextView mTvCommunity;
-    @BindView(R.id.tv_build_num)
+    @BindView(R.id.tv_community_area)
-    TextView mTvBuildNum;
+    TextView mTvCommunityArea;
+    @BindView(R.id.tv_building_num)
+    TextView mTvBuildingNum;
+    @BindView(R.id.tv_unit_num)
+    TextView mTvUnitNum;
+    @BindView(R.id.tv_floor_num)
+    TextView mTvFloorNum;
+    @BindView(R.id.tv_door)
+    TextView mTvDoor;
+    @BindView(R.id.tv_house_type)
+    TextView mTvHouseType;
+    @BindView(R.id.tv_house_property)
+    TextView mTvHouseProperty;
+    @BindView(R.id.tv_house_kind)
+    TextView mTvHouseKind;
+    @BindView(R.id.tv_house_frame)
+    TextView mTvHouseFrame;
+    @BindView(R.id.tv_build_use)
+    TextView mTvBuildUse;
+    @BindView(R.id.tv_house_use)
+    TextView mTvHouseUse;
+    @BindView(R.id.tv_trouble)
+    TextView mTvTrouble;
+    @BindView(R.id.tv_house_number)
+    TextView mTvHouseNumber;
+    @BindView(R.id.tv_house_area)
+    TextView mTvHouseArea;
+    @BindView(R.id.tv_right_num)
+    TextView mTvRightNum;
+    @BindView(R.id.tv_register_date)
+    TextView mTvRegisterDate;
+    @BindView(R.id.tv_dept)
+    TextView mTvDept;
+    @BindView(R.id.sw_is_hire)
+    Switch mSwIsHire;
+    @BindView(R.id.sw_is_empty)
+    Switch mSwIsEmpty;
+    @BindView(R.id.tv_renting_type)
+    TextView mTvRentingType;
+    @BindView(R.id.tv_hire_use)
+    TextView mTvHireUse;
     @BindView(R.id.tv_owner_name)
     TextView mTvOwnerName;
+    @BindView(R.id.tv_owner_id_card_type)
+    TextView mTvOwnerIdCardType;
+    @BindView(R.id.tv_owner_id_card)
+    TextView mTvOwnerIdCard;
     @BindView(R.id.tv_owner_phone)
     TextView mTvOwnerPhone;
-    @BindView(R.id.tv_type)
+    @BindView(R.id.tv_manage_name)
-    TextView mTvType;
+    TextView mTvManageName;
-    @BindView(R.id.ll_content)
+    @BindView(R.id.tv_manage_id_card_type)
-    LinearLayout mLlContent;
+    TextView mTvManageIdCardType;
-    @BindView(R.id.btn_confirm)
+    @BindView(R.id.tv_manage_id_card)
-    Button mBtnConfirm;
+    TextView mTvManageIdCard;
-    @BindView(R.id.tv_hint)
+    @BindView(R.id.tv_manage_phone)
-    TextView mTvHint;
+    TextView mTvManagePhone;
-    @BindView(R.id.rlv_person)
+    @BindView(R.id.tv_manage_relation)
-    RecyclerView mRlvPerson;
+    TextView mTvManageRelation;
-    @BindView(R.id.ll_person)
+    @BindView(R.id.btn_del)
-    LinearLayout mLlPerson;
+    Button mBtnDel;
-    private Unbinder mBind;
+    @BindView(R.id.btn_edit)
+    Button mBtnEdit;
     private String mId;
-    private BuildHouseDetailBean mDetailBean;
+    private Unbinder mBind;
-    private List<com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean> mPersons;
-    private NewHousePersonAdapter mAdapter;
 
     @Override
     protected int setLayoutId() {
@@ -82,337 +114,147 @@ public class NewHouseDetailActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("房屋详情");
+        mTvBaseTitle.setText("详情");
-        mTvPublish.setVisibility(View.VISIBLE);
-        mTvPublish.setText("编辑");
-        mTvPublish.setOnClickListener(v -> {
-            Intent intent = new Intent();
-            intent.putExtra("id", mId);
-            intent.setClass(mActivity, NewEditHouseActivity.class);
-            startActivityForResult(intent, 12);
-        });
         refreshView(STATE_LOAD_LOADING);
         mId = getIntent().getStringExtra("id");
-        getHouseDetail();
+        initContentView();
-        mPersons = new ArrayList<>();
+        getDetailById();
-        mAdapter = new NewHousePersonAdapter(mActivity, mPersons);
-        mRlvPerson.setLayoutManager(new LinearLayoutManager(mActivity));
-        mRlvPerson.setAdapter(mAdapter);
-        mAdapter.addOnEditListener(new NewHousePersonAdapter.OnEditListener() {
-            @Override
-            public void onDel(com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean bean, int pos) {
-                doDelPerson(bean, pos);
-            }
-
-            @Override
-            public void onEdit(com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean b, int pos) {
-
-            }
-        });
-        mBtnConfirm.setOnClickListener(v -> {
-            Intent intent = new Intent(mActivity, NewBindPersonActivity.class);
-            intent.putExtra("id", mId);
-            startActivityForResult(intent, 12);
-        });
-        mIvDel.setOnClickListener(v -> doDelHose());
     }
 
     /**
-     * 删除绑定人员
+     * 获取详情
      */
-    private void doDelPerson(com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean bean, int pos) {
+    private void getDetailById() {
-        new AlertDialog.Builder(mActivity)
-            .setTitle("警告")
-            .setMessage("确定要删除该人员吗?")
-            .setPositiveButton("确定", (dialog, which) -> {
-                dialog.dismiss();
-                confirmDel(bean, pos);
-            })
-            .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
-            .create().show();
-    }
-
-    /**
-     * 确认删除
-     */
-    private void confirmDel(com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean bean, int pos) {
-        ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
-        dialog.dismiss();
-        com.sucstepsoft.realtimelocation.beans.BindPersonBean saveBean = new com.sucstepsoft.realtimelocation.beans.BindPersonBean();
-        saveBean.setBuildingHouseId(mId);
-        saveBean.setIdCardNumber(bean.getIdCardNumber());
-        Gson gson = new Gson();
-        String obj = gson.toJson(saveBean);
-        RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
         RetrofitManager.getInstance()
-            .create(LocationApiService.class)
+                .create(LocationApiService.class)
-            .doDelNewBindPerson(body, UserLgUtils.getToken())
+                .getNewHouseDetail(mId, UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<SuccessBean>() {
+                .subscribe(new Observer<NewHouseDetailBean>() {
-                @Override
+                    @Override
-                public void onSubscribe(Disposable d) {
+                    public void onSubscribe(Disposable d) {
 
-                }
+                    }
 
-                @Override
+                    @Override
-                public void onNext(SuccessBean successBean) {
+                    public void onNext(NewHouseDetailBean newCommunityDetailBean) {
-                    dialog.dismiss();
+                        setDataToView(newCommunityDetailBean);
-                    ToastUtils.showShort("删除成功");
+                    }
-                    getBindPersonList();
-                }
 
-                @Override
+                    @Override
-                public void onError(Throwable e) {
+                    public void onError(Throwable e) {
-                    dialog.dismiss();
+                        refreshView(STATE_LOAD_ERROR);
-                    ExceptionHandler.handleException(e);
+                        ExceptionHandler.handleException(e);
-                }
+                    }
 
-                @Override
+                    @Override
-                public void onComplete() {
+                    public void onComplete() {
 
-                }
+                    }
-            });
+                });
     }
 
+    /**
+     * 显示内容
+     */
+    private void setDataToView(NewHouseDetailBean bean) {
+        mTvStreet.setText(bean.getStreetName());
+        mTvCommunity.setText(bean.getCommunityName());
+        mTvCommunityArea.setText(bean.getResidentialName());
+        mTvBuildingNum.setText(bean.getBuildingName());
+        mTvUnitNum.setText(bean.getAffiliationUnit() + "");
+        mTvFloorNum.setText(bean.getAffiliationFloors() + "");
+        mTvDoor.setText(bean.getHouseNum() + "");
+        mTvHouseType.setText(bean.getCategoryName());
+        mTvHouseProperty.setText(bean.getNatureName());
+        mTvHouseKind.setText(bean.getTypeName());
+        mTvBuildUse.setText(bean.getBuildingPurposeName());
+        mTvHouseUse.setText(bean.getRoomUseName());
+        mTvTrouble.setText(bean.getDangerName());
+        mTvHouseNumber.setText(bean.getRoomNum() + "");
+        mTvHouseArea.setText(bean.getRoomArea());
+        mTvRightNum.setText(bean.getCertificateNum() + "");
+        mTvHouseFrame.setText(bean.getStructureName());
+        mTvRegisterDate.setText(bean.getRegistrationDate());
+        mTvDept.setText(bean.getAffiliatedUnit());
+        mSwIsEmpty.setChecked(1 == bean.getIsVacant());
+        mTvHireUse.setText(bean.getRentalPurposes());
+        mSwIsHire.setChecked(1 == bean.getIsRental());
+        mTvRentingType.setText(bean.getLodgeTypeName());
+        mTvOwnerName.setText(bean.getHomeowner());
+        mTvOwnerIdCardType.setText(bean.getDocumentName());
+        mTvOwnerIdCard.setText(bean.getDocumentNum() + "");
+        mTvOwnerPhone.setText(bean.getPhone());
+        mTvManageName.setText(bean.getCustodian());
+        mTvManageIdCardType.setText(bean.getCustodianDocumentName());
+        mTvManageIdCard.setText(bean.getCustodianDocumentNum());
+        mTvManagePhone.setText(bean.getCustodianPhone());
+        mTvManageRelation.setText(bean.getRelationshipHomeowner());
+        refreshView(STATE_LOAD_SUCCESS);
+    }
+
+    private void initContentView() {
+
+        mBtnEdit.setOnClickListener(v -> {
+            Intent intent = new Intent(mActivity, NewHouseAddActivity.class);
+            intent.putExtra("id", mId);
+            intent.putExtra("title", "房屋信息编辑");
+            startActivityForResult(intent, 1234);
+        });
+        mBtnDel.setOnClickListener(v -> doDel());
+    }
+
+    private void doDel() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        builder.setTitle("提示")
+                .setMessage("确定要删除该小区信息吗?")
+                .setPositiveButton("确定", (dialog, which) -> {
+                    dialog.dismiss();
+                    ProgressDialog dialog1 = UIUtil.initDialog(mActivity, "删除中...");
+                    dialog1.show();
+                    RetrofitManager.getInstance()
+                            .create(LocationApiService.class)
+                            .doDelNewHouse(mId, UserLgUtils.getToken())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new Observer<SuccessBean>() {
+                                @Override
+                                public void onSubscribe(@NonNull Disposable d) {
+
+                                }
+
+                                @Override
+                                public void onNext(@NonNull SuccessBean successBean) {
+                                    ToastUtils.showShort("删除成功");
+                                    dialog1.dismiss();
+                                    setResult(RESULT_OK);
+                                    finish();
+                                }
+
+                                @Override
+                                public void onError(@NonNull Throwable e) {
+                                    dialog1.dismiss();
+                                    ExceptionHandler.handleException(e);
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                })
+                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+                .create()
+                .show();
+    }
+
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        if (requestCode == 12) {
+        if (resultCode == RESULT_OK) {
-            if (resultCode == 123) {
+            refreshView(STATE_LOAD_LOADING);
-                refreshView(STATE_LOAD_LOADING);
+            getDetailById();
-                getHouseDetail();
-            }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
-
-    /**
-     * 删除
-     */
-    private void doDelHose() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
-        builder.setTitle("警告")
-            .setMessage("确定要删除该房屋吗?")
-            .setPositiveButton("确定", (dialog, which) -> {
-                dialog.dismiss();
-                ProgressDialog pDialog = UIUtil.initDialog(mActivity, "删除中...");
-                pDialog.show();
-                RetrofitManager.getInstance()
-                    .create(LocationApiService.class)
-                    .doDelHouseTenement(mId, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<SuccessBean>() {
-                        @Override
-                        public void onSubscribe(Disposable d) {
-
-                        }
-
-                        @Override
-                        public void onNext(SuccessBean successBean) {
-                            Intent intent = new Intent();
-                            intent.putExtra("isRefresh", true);
-                            setResult(123, intent);
-                            pDialog.dismiss();
-                            ToastUtils.showShort("删除成功");
-                            finish();
-                        }
-
-                        @Override
-                        public void onError(Throwable e) {
-                            pDialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
-
-                        @Override
-                        public void onComplete() {
-
-                        }
-                    });
-            })
-            .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
-            .create()
-            .show();
-
-    }
-
-    /**
-     * 显示绑定弹窗
-     */
-    private void showBindDialog() {
-        CenterInputDialogView build = new CenterInputDialogView.DialogBuilder(mActivity)
-            .setIscancelable(true)
-            .setIsBackCancelable(true)
-            .build();
-        build.addOnChoseListener(new CenterInputDialogView.OnChoseListener() {
-            @Override
-            public void choseFile() {
-            }
-
-            @Override
-            public void choseAlbum() {
-            }
-
-            @Override
-            public void choseShoot() {
-            }
-
-            @Override
-            public void loginOut() {
-
-            }
-
-            @Override
-            public void changePwd() {
-            }
-
-            @Override
-            public void bindPerson(String name, String gender, String phone, String idCard) {
-                doBindPerson(name, gender, phone, idCard);
-                build.dismiss();
-            }
-        });
-        build.show();
-    }
-
-    /**
-     * 绑定人员
-     */
-    private void doBindPerson(String name, String gender, String phone, String idCard) {
-//        ProgressDialog dialog = UIUtil.initDialog(mActivity, "添加中...");
-//        dialog.show();
-//        BindPersonBean bean = new BindPersonBean();
-//        bean.setBuildingHouseId(mId);
-//        bean.setName(name);
-//        bean.setSex(gender);
-//        bean.setPhone(phone);
-//        bean.setCardNumber(idCard);
-//        Gson gson = new Gson();
-//        String obj = gson.toJson(bean);
-//        RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
-//        RetrofitManager.getInstance()
-//            .create(LocationApiService.class)
-//            .doBindPerson(body, UserLgUtils.getToken())
-//            .subscribeOn(Schedulers.io())
-//            .observeOn(AndroidSchedulers.mainThread())
-//            .subscribe(new Observer<SuccessBean>() {
-//                @Override
-//                public void onSubscribe(Disposable d) {
-//
-//                }
-//
-//                @Override
-//                public void onNext(SuccessBean successBean) {
-//                    mTvHint.setVisibility(View.GONE);
-//                    mRlvPerson.setVisibility(View.VISIBLE);
-//                    HousePersonListBean.RowsBean rowsBean = new HousePersonListBean.RowsBean();
-//                    rowsBean.setName(name);
-//                    rowsBean.setPhone(phone);
-//                    rowsBean.setSex(gender);
-//                    mPersons.add(rowsBean);
-//                    mAdapter.setData(mPersons);
-//                    dialog.dismiss();
-//                    ToastUtils.showShort("添加成功");
-//                }
-//
-//                @Override
-//                public void onError(Throwable e) {
-//                    dialog.dismiss();
-//                    ExceptionHandler.handleException(e);
-//                }
-//
-//                @Override
-//                public void onComplete() {
-//
-//                }
-//            });
-    }
-
-    private void getHouseDetail() {
-        RetrofitManager.getInstance()
-            .create(LocationApiService.class)
-            .getHouseDetailById(mId, UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<BuildHouseDetailBean>() {
-                @Override
-                public void onSubscribe(Disposable d) {
-
-                }
-
-                @Override
-                public void onNext(BuildHouseDetailBean bean) {
-                    mDetailBean = bean;
-                    //获取绑定的人员
-                    getBindPersonList();
-                    setDataToView();
-                }
-
-                @Override
-                public void onError(Throwable e) {
-
-                }
-
-                @Override
-                public void onComplete() {
-
-                }
-            });
-    }
-
-    private void getBindPersonList() {
-        ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
-        dialog.show();
-        RetrofitManager.getInstance()
-            .create(LocationApiService.class)
-            .getBindPersonList(mId, UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<List<com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean>>() {
-                @Override
-                public void onSubscribe(Disposable d) {
-
-                }
-
-                @Override
-                public void onNext(List<com.sucstepsoft.cm_utils.core.retrofit_net.bean.BindPersonBean.RowsBean> rowsBeans) {
-                    mPersons = rowsBeans;
-                    if (mPersons != null && mPersons.size() > 0) {
-                        mTvHint.setVisibility(View.GONE);
-                        mRlvPerson.setVisibility(View.VISIBLE);
-                    } else {
-                        mTvHint.setVisibility(View.VISIBLE);
-                        mRlvPerson.setVisibility(View.GONE);
-                    }
-                    mAdapter.setData(mPersons);
-                    dialog.dismiss();
-                }
-
-                @Override
-                public void onError(Throwable e) {
-                    dialog.dismiss();
-                    ExceptionHandler.handleException(e);
-                }
-
-                @Override
-                public void onComplete() {
-
-                }
-            });
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        refreshView(STATE_LOAD_LOADING);
-        getHouseDetail();
-    }
-
-    private void setDataToView() {
-        refreshView(STATE_LOAD_SUCCESS);
-        mTvBuildNum.setText(mDetailBean.getHouseName());//房屋编号(名称)
-        mTvOwnerName.setText(mDetailBean.getOwnerName());//户主姓名
-        mTvOwnerPhone.setText(mDetailBean.getOwnerPhone());//户主联系电话
-        mTvType.setText(mDetailBean.getHouseStatus());//房屋状态
-    }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/newhouse/fragments/HouseManageNewFragment.java

@@ -1,16 +1,35 @@
 package com.sucstepsoft.realtimelocation.activitys.census.newhouse.fragments;
 
 import android.app.Activity;
-import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 
+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.LazyFragment;
+import com.sucstepsoft.cm_utils.utils.ToastUtils;
+import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.NewHouseAddActivity;
+import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.NewHouseDetailActivity;
+import com.sucstepsoft.realtimelocation.adapters.NewHouseAdapter;
+import com.sucstepsoft.realtimelocation.beans.NewHouseBean;
+import com.sucstepsoft.realtimelocation.net.LocationApiService;
 
+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;
 
 /**
  * 作者: adam
@@ -19,6 +38,14 @@ import butterknife.Unbinder;
  * 描述: 房屋管理
  */
 public class HouseManageNewFragment extends LazyFragment {
+
+    @BindView(R.id.rlv_items)
+    XRecyclerView mRlvItems;
+    private List<NewHouseBean.RowsBean> mDatas;
+    private NewHouseAdapter mAdapter;
+    private int mCurPage = 1;
+    private Disposable mDisposable;
+
     private Activity mActivity;
     private Unbinder mBind;
 
@@ -28,12 +55,154 @@ public class HouseManageNewFragment extends LazyFragment {
         View view = LayoutInflater.from(mActivity).inflate(R.layout.fragment_house_manage_new, null);
         setContentView(view);
         mBind = ButterKnife.bind(this, view);
+        mDatas = new ArrayList<>();
+        mAdapter = new NewHouseAdapter(mActivity, mDatas, 2);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
+        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        mRlvItems.setLayoutManager(layoutManager);
+        mRlvItems.setAdapter(mAdapter);
+        mAdapter.addOnItemClickListener(bean -> showIssueDetail(bean));
+        mRlvItems.setNoMore(true);
+        mRlvItems.setRefreshProgressStyle(ProgressStyle.BallGridBeat);
+        mRlvItems.setLoadingMoreProgressStyle(ProgressStyle.Pacman);
+        mRlvItems.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                refresh();
+            }
+
+            @Override
+            public void onLoadMore() {
+                loadMore();
+            }
+        });
+        getHouseList(1);
+    }
+
+    /**
+     * 显示详情
+     *
+     * @param bean
+     */
+    private void showIssueDetail(NewHouseBean.RowsBean bean) {
+        Intent intent = new Intent();
+        intent.putExtra("id", bean.getHouseId());
+        intent.setClass(mActivity, NewHouseDetailActivity.class);
+        startActivityForResult(intent, 1234);
+    }
+
+    @Override
+    protected void onFragmentStartLazy() {
+        super.onFragmentStartLazy();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.mActivity = activity;
     }
 
 
     @Override
-    public void onAttach(Context context) {
+    protected void onDestroyViewLazy() {
-        super.onAttach(context);
+        super.onDestroyViewLazy();
-        this.mActivity = getActivity();
+        mRlvItems.destroy();
+        if (mDisposable != null && !mDisposable.isDisposed()) {
+            mDisposable.dispose();
+        }
+        mRlvItems = null;
+        mBind.unbind();
+        mAdapter = null;
+        mDatas = null;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK) {
+            refresh();
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+
+    @Override
+    public void startAddActivity(String id) {
+        Intent intent = new Intent(mActivity, NewHouseAddActivity.class);
+        intent.putExtra("title", "房屋信息录入");
+        startActivityForResult(intent, 1234);
+    }
+
+    /**
+     * 待下派
+     */
+    private void getHouseList(int page) {
+        mCurPage = page;
+        RetrofitManager.getInstance()
+                .create(LocationApiService.class)
+                .getNewHouseList(page + "", "", UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<NewHouseBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        mDisposable = d;
+                    }
+
+                    @Override
+                    public void onNext(NewHouseBean newsListBean) {
+                        if (newsListBean != null && newsListBean.getRows() != null && newsListBean.getRows().size() > 0) {
+                            ++mCurPage;
+                            if (page == 1) {
+                                mDatas.clear();
+                                mDatas.addAll(newsListBean.getRows());
+                            } else {
+                                mDatas.addAll(newsListBean.getRows());
+                            }
+                            mAdapter.notifyDataSetChanged();
+                            mRlvItems.refreshComplete();
+                            if (mDatas.size() >= newsListBean.getTotal()) {
+                                mRlvItems.loadMoreComplete();
+                                mRlvItems.setNoMore(true);
+                            } else {
+                                mRlvItems.loadMoreComplete();
+                                mRlvItems.setNoMore(false);
+                            }
+                        } else {
+                            if (page > 1) {
+                                mRlvItems.loadMoreComplete();
+                                mRlvItems.setNoMore(true);
+                            } else {
+                                //无数据
+                                mRlvItems.refreshComplete();
+                                mRlvItems.setNoMore(true);
+                                ToastUtils.showShort("暂无数据");
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        e.printStackTrace();
+                        if (mRlvItems != null) {
+                            mRlvItems.refreshComplete();
+                            mRlvItems.loadMoreComplete();
+                        }
+                        ToastUtils.showShort("数据加载失败,请稍后重试");
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+
+    private void refresh() {
+        getHouseList(1);
+    }
+
+    private void loadMore() {
+        getHouseList(mCurPage);
     }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewHouseAdapter.java

@@ -0,0 +1,69 @@
+package com.sucstepsoft.realtimelocation.adapters;
+
+import android.content.Context;
+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.NewHouseHolder;
+import com.sucstepsoft.realtimelocation.beans.NewHouseBean;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2020/11/17 - 1:22 PM
+ * 邮箱: itgaojian@163.com
+ * 描述: 人口adapter
+ */
+public class NewHouseAdapter extends BaseRecyclerAdapter<NewHouseBean.RowsBean, NewHouseHolder> {
+    private int mType = 1;
+
+    public NewHouseAdapter(Context ctx, List<NewHouseBean.RowsBean> list) {
+        super(ctx, list);
+    }
+
+    public NewHouseAdapter(Context ctx, List<NewHouseBean.RowsBean> list, int type) {
+        super(ctx, list);
+        this.mType = type;
+    }
+
+
+    @Override
+    public NewHouseHolder createHolder(ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_community_sel_new, parent, false);
+        return new NewHouseHolder(itemView);
+    }
+
+    @Override
+    public void bindHolder(NewHouseHolder censusPersonHolder, int i) {
+        NewHouseBean.RowsBean bean = mData.get(i);
+        censusPersonHolder.mTvAreaName.setText(bean.getStreetName());
+        censusPersonHolder.mTvDistrictName.setText(bean.getBuildingName() + "(" + bean.getHouseNum() + ")");
+        censusPersonHolder.mTvCommunityName.setText(bean.getCommunityName());
+        censusPersonHolder.mTvUnit.setVisibility(View.VISIBLE);
+        censusPersonHolder.mTvUnit.setText(bean.getResidentialName());
+        censusPersonHolder.mTvBuilding.setVisibility(View.GONE);
+        censusPersonHolder.mTvAddress.setVisibility(View.GONE);
+        if (mType == 1) {
+            censusPersonHolder.mBtnConfirm.setVisibility(View.VISIBLE);
+            censusPersonHolder.mBtnConfirm.setOnClickListener(v -> mEditListener.onEdit(bean, i));
+        } else {
+            censusPersonHolder.mBtnConfirm.setVisibility(View.GONE);
+        }
+    }
+
+    private OnEditListener mEditListener;
+
+    public void addOnEditListener(OnEditListener mListener) {
+        this.mEditListener = mListener;
+    }
+
+    public interface OnEditListener {
+        void onDel(NewHouseBean.RowsBean bean, int pos);
+
+        void onEdit(NewHouseBean.RowsBean bean, int pos);
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/adapters/holders/NewHouseHolder.java

@@ -0,0 +1,36 @@
+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 NewHouseHolder extends RecyclerView.ViewHolder {
+    public TextView mTvAreaName;//街道名称
+    public TextView mTvCommunityName;//社区名称
+    public TextView mTvDistrictName;//小区名称
+    public Button mBtnConfirm;//选择
+    public TextView mTvAddress;//详细地址
+    public TextView mTvUnit;//小区
+    public TextView mTvBuilding;
+
+    public NewHouseHolder(@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);
+        mBtnConfirm = itemView.findViewById(R.id.btn_confirm);
+        mTvAddress = itemView.findViewById(R.id.tv_location);
+        mTvUnit = itemView.findViewById(R.id.tv_unit);
+        mTvBuilding = itemView.findViewById(R.id.tv_building);
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewBuildingBean.java

@@ -1,5 +1,7 @@
 package com.sucstepsoft.realtimelocation.beans;
 
+import com.contrarywind.interfaces.IPickerViewData;
+
 import java.util.List;
 
 public class NewBuildingBean {
@@ -32,14 +34,14 @@ public class NewBuildingBean {
         this.total = total;
     }
 
-    public static class RowsBean {
+    public static class RowsBean implements IPickerViewData {
         private String address;
-        private int buildNum;
+        private String buildNum;
         private String buildingId;
         private String community;
         private String communityName;
         private String creator;
-        private int floorsNum;
+        private String floorsNum;
         private String gmtCreate;
         private String gmtModified;
         private String image;
@@ -52,7 +54,7 @@ public class NewBuildingBean {
         private String residentialName;
         private String street;
         private String streetName;
-        private int unitNum;
+        private String unitNum;
 
         public String getAddress() {
             return address;
@@ -62,13 +64,6 @@ public class NewBuildingBean {
             this.address = address;
         }
 
-        public int getBuildNum() {
-            return buildNum;
-        }
-
-        public void setBuildNum(int buildNum) {
-            this.buildNum = buildNum;
-        }
 
         public String getBuildingId() {
             return buildingId;
@@ -102,13 +97,6 @@ public class NewBuildingBean {
             this.creator = creator;
         }
 
-        public int getFloorsNum() {
-            return floorsNum;
-        }
-
-        public void setFloorsNum(int floorsNum) {
-            this.floorsNum = floorsNum;
-        }
 
         public String getGmtCreate() {
             return gmtCreate;
@@ -206,12 +194,33 @@ public class NewBuildingBean {
             this.streetName = streetName;
         }
 
-        public int getUnitNum() {
+        public String getBuildNum() {
+            return buildNum;
+        }
+
+        public void setBuildNum(String buildNum) {
+            this.buildNum = buildNum;
+        }
+
+        public String getFloorsNum() {
+            return floorsNum;
+        }
+
+        public void setFloorsNum(String floorsNum) {
+            this.floorsNum = floorsNum;
+        }
+
+        public String getUnitNum() {
             return unitNum;
         }
 
-        public void setUnitNum(int unitNum) {
+        public void setUnitNum(String unitNum) {
             this.unitNum = unitNum;
         }
+
+        @Override
+        public String getPickerViewText() {
+            return name;
+        }
     }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseBean.java

@@ -0,0 +1,532 @@
+package com.sucstepsoft.realtimelocation.beans;
+
+import java.util.List;
+
+public class NewHouseBean {
+
+    private int page;
+    private List<RowsBean> rows;
+    private int total;
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public List<RowsBean> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<RowsBean> rows) {
+        this.rows = rows;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public static class RowsBean {
+        private String affiliatedUnit;
+        private int affiliationFloors;
+        private int affiliationUnit;
+        private String buildingId;
+        private String buildingName;
+        private String buildingPurposeId;
+        private String buildingPurposeName;
+        private String categoryId;
+        private String categoryName;
+        private String certificateNum;
+        private String community;
+        private String communityName;
+        private String creator;
+        private String custodian;
+        private String custodianDocumentId;
+        private String custodianDocumentName;
+        private String custodianDocumentNum;
+        private String custodianPhone;
+        private String dangerId;
+        private String dangerName;
+        private String documentId;
+        private String documentName;
+        private String documentNum;
+        private int floorsNum;
+        private String gmtCreate;
+        private String gmtModified;
+        private String homeowner;
+        private String houseId;
+        private int houseNum;
+        private String houseType;
+        private int isDelete;
+        private int isRental;
+        private int isVacant;
+        private String lodgeTypeId;
+        private String lodgeTypeName;
+        private String modifier;
+        private String natureId;
+        private String natureName;
+        private String phone;
+        private String registrationDate;
+        private String relationshipHomeowner;
+        private String rentalPurposes;
+        private String residentialId;
+        private String residentialName;
+        private String roomArea;
+        private int roomNum;
+        private String roomUseId;
+        private String roomUseName;
+        private String street;
+        private String streetName;
+        private String structureId;
+        private String structureName;
+        private String typeId;
+        private String typeName;
+        private int unitNum;
+
+        public String getAffiliatedUnit() {
+            return affiliatedUnit;
+        }
+
+        public void setAffiliatedUnit(String affiliatedUnit) {
+            this.affiliatedUnit = affiliatedUnit;
+        }
+
+        public int getAffiliationFloors() {
+            return affiliationFloors;
+        }
+
+        public void setAffiliationFloors(int affiliationFloors) {
+            this.affiliationFloors = affiliationFloors;
+        }
+
+        public int getAffiliationUnit() {
+            return affiliationUnit;
+        }
+
+        public void setAffiliationUnit(int affiliationUnit) {
+            this.affiliationUnit = affiliationUnit;
+        }
+
+        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 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 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 getCertificateNum() {
+            return certificateNum;
+        }
+
+        public void setCertificateNum(String certificateNum) {
+            this.certificateNum = certificateNum;
+        }
+
+        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 getCreator() {
+            return creator;
+        }
+
+        public void setCreator(String creator) {
+            this.creator = creator;
+        }
+
+        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 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 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 int getFloorsNum() {
+            return floorsNum;
+        }
+
+        public void setFloorsNum(int floorsNum) {
+            this.floorsNum = floorsNum;
+        }
+
+        public String getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(String gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+        public String getGmtModified() {
+            return gmtModified;
+        }
+
+        public void setGmtModified(String gmtModified) {
+            this.gmtModified = gmtModified;
+        }
+
+        public String getHomeowner() {
+            return homeowner;
+        }
+
+        public void setHomeowner(String homeowner) {
+            this.homeowner = homeowner;
+        }
+
+        public String getHouseId() {
+            return houseId;
+        }
+
+        public void setHouseId(String houseId) {
+            this.houseId = houseId;
+        }
+
+        public int getHouseNum() {
+            return houseNum;
+        }
+
+        public void setHouseNum(int houseNum) {
+            this.houseNum = houseNum;
+        }
+
+        public String getHouseType() {
+            return houseType;
+        }
+
+        public void setHouseType(String houseType) {
+            this.houseType = houseType;
+        }
+
+        public int getIsDelete() {
+            return isDelete;
+        }
+
+        public void setIsDelete(int isDelete) {
+            this.isDelete = isDelete;
+        }
+
+        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 getModifier() {
+            return modifier;
+        }
+
+        public void setModifier(String modifier) {
+            this.modifier = modifier;
+        }
+
+        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 getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
+        public String getRegistrationDate() {
+            return registrationDate;
+        }
+
+        public void setRegistrationDate(String registrationDate) {
+            this.registrationDate = registrationDate;
+        }
+
+        public String getRelationshipHomeowner() {
+            return relationshipHomeowner;
+        }
+
+        public void setRelationshipHomeowner(String relationshipHomeowner) {
+            this.relationshipHomeowner = relationshipHomeowner;
+        }
+
+        public String getRentalPurposes() {
+            return rentalPurposes;
+        }
+
+        public void setRentalPurposes(String rentalPurposes) {
+            this.rentalPurposes = rentalPurposes;
+        }
+
+        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 getRoomArea() {
+            return roomArea;
+        }
+
+        public void setRoomArea(String roomArea) {
+            this.roomArea = roomArea;
+        }
+
+        public int getRoomNum() {
+            return roomNum;
+        }
+
+        public void setRoomNum(int roomNum) {
+            this.roomNum = roomNum;
+        }
+
+        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 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 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 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 int getUnitNum() {
+            return unitNum;
+        }
+
+        public void setUnitNum(int unitNum) {
+            this.unitNum = unitNum;
+        }
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/beans/NewHouseDetailBean.java

@@ -0,0 +1,500 @@
+package com.sucstepsoft.realtimelocation.beans;
+
+public class NewHouseDetailBean {
+
+    private String affiliatedUnit;
+    private int affiliationFloors;
+    private int affiliationUnit;
+    private String buildingId;
+    private String buildingName;
+    private String buildingPurposeId;
+    private String buildingPurposeName;
+    private String categoryId;
+    private String categoryName;
+    private String certificateNum;
+    private String community;
+    private String communityName;
+    private String creator;
+    private String custodian;
+    private String custodianDocumentId;
+    private String custodianDocumentName;
+    private String custodianDocumentNum;
+    private String custodianPhone;
+    private String dangerId;
+    private String dangerName;
+    private String documentId;
+    private String documentName;
+    private String documentNum;
+    private int floorsNum;
+    private String gmtCreate;
+    private String gmtModified;
+    private String homeowner;
+    private String houseId;
+    private int houseNum;
+    private String houseType;
+    private int isDelete;
+    private int isRental;
+    private int isVacant;
+    private String lodgeTypeId;
+    private String lodgeTypeName;
+    private String modifier;
+    private String natureId;
+    private String natureName;
+    private String phone;
+    private String registrationDate;
+    private String relationshipHomeowner;
+    private String rentalPurposes;
+    private String residentialId;
+    private String residentialName;
+    private String roomArea;
+    private int roomNum;
+    private String roomUseId;
+    private String roomUseName;
+    private String street;
+    private String streetName;
+    private String structureId;
+    private String structureName;
+    private String typeId;
+    private String typeName;
+    private int unitNum;
+
+    public String getAffiliatedUnit() {
+        return affiliatedUnit;
+    }
+
+    public void setAffiliatedUnit(String affiliatedUnit) {
+        this.affiliatedUnit = affiliatedUnit;
+    }
+
+    public int getAffiliationFloors() {
+        return affiliationFloors;
+    }
+
+    public void setAffiliationFloors(int affiliationFloors) {
+        this.affiliationFloors = affiliationFloors;
+    }
+
+    public int getAffiliationUnit() {
+        return affiliationUnit;
+    }
+
+    public void setAffiliationUnit(int affiliationUnit) {
+        this.affiliationUnit = affiliationUnit;
+    }
+
+    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 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 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 getCertificateNum() {
+        return certificateNum;
+    }
+
+    public void setCertificateNum(String certificateNum) {
+        this.certificateNum = certificateNum;
+    }
+
+    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 getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    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 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 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 int getFloorsNum() {
+        return floorsNum;
+    }
+
+    public void setFloorsNum(int floorsNum) {
+        this.floorsNum = floorsNum;
+    }
+
+    public String getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public String getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getHomeowner() {
+        return homeowner;
+    }
+
+    public void setHomeowner(String homeowner) {
+        this.homeowner = homeowner;
+    }
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId;
+    }
+
+    public int getHouseNum() {
+        return houseNum;
+    }
+
+    public void setHouseNum(int houseNum) {
+        this.houseNum = houseNum;
+    }
+
+    public String getHouseType() {
+        return houseType;
+    }
+
+    public void setHouseType(String houseType) {
+        this.houseType = houseType;
+    }
+
+    public int getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(int isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    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 getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    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 getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getRegistrationDate() {
+        return registrationDate;
+    }
+
+    public void setRegistrationDate(String registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+    public String getRelationshipHomeowner() {
+        return relationshipHomeowner;
+    }
+
+    public void setRelationshipHomeowner(String relationshipHomeowner) {
+        this.relationshipHomeowner = relationshipHomeowner;
+    }
+
+    public String getRentalPurposes() {
+        return rentalPurposes;
+    }
+
+    public void setRentalPurposes(String rentalPurposes) {
+        this.rentalPurposes = rentalPurposes;
+    }
+
+    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 getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
+
+    public int getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(int roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    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 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 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 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 int getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(int unitNum) {
+        this.unitNum = unitNum;
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/beans/SaveNewHouseBean.java

@@ -0,0 +1,419 @@
+package com.sucstepsoft.realtimelocation.beans;
+
+public class SaveNewHouseBean {
+
+    private String affiliatedUnit;
+    private int affiliationFloors;
+    private int affiliationUnit;
+    private String buildingId;
+    private String buildingName;
+    private String buildingPurposeId;
+    private String buildingPurposeName;
+    private String categoryId;
+    private String categoryName;
+    private String certificateNum;
+    private String community;
+    private String communityName;
+    private String custodian;
+    private String custodianDocumentId;
+    private String custodianDocumentName;
+    private String custodianDocumentNum;
+    private String custodianPhone;
+    private String dangerId;
+    private String dangerName;
+    private String documentId;
+    private String documentName;
+    private String documentNum;
+    private String homeowner;
+    private int houseNum;
+    private int isRental;
+    private int isVacant;
+    private String lodgeTypeId;
+    private String lodgeTypeName;
+    private String natureId;
+    private String natureName;
+    private String phone;
+    private String registrationDate;
+    private String relationshipHomeowner;
+    private String rentalPurposes;
+    private String residentialId;
+    private String residentialName;
+    private String roomArea;
+    private int roomNum;
+    private String roomUseId;
+    private String roomUseName;
+    private String street;
+    private String streetName;
+    private String structureId;
+    private String structureName;
+    private String typeId;
+    private String typeName;
+
+    public String getAffiliatedUnit() {
+        return affiliatedUnit;
+    }
+
+    public void setAffiliatedUnit(String affiliatedUnit) {
+        this.affiliatedUnit = affiliatedUnit;
+    }
+
+    public int getAffiliationFloors() {
+        return affiliationFloors;
+    }
+
+    public void setAffiliationFloors(int affiliationFloors) {
+        this.affiliationFloors = affiliationFloors;
+    }
+
+    public int getAffiliationUnit() {
+        return affiliationUnit;
+    }
+
+    public void setAffiliationUnit(int affiliationUnit) {
+        this.affiliationUnit = affiliationUnit;
+    }
+
+    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 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 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 getCertificateNum() {
+        return certificateNum;
+    }
+
+    public void setCertificateNum(String certificateNum) {
+        this.certificateNum = certificateNum;
+    }
+
+    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 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 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 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 getHomeowner() {
+        return homeowner;
+    }
+
+    public void setHomeowner(String homeowner) {
+        this.homeowner = homeowner;
+    }
+
+    public int getHouseNum() {
+        return houseNum;
+    }
+
+    public void setHouseNum(int houseNum) {
+        this.houseNum = houseNum;
+    }
+
+    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 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 getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getRegistrationDate() {
+        return registrationDate;
+    }
+
+    public void setRegistrationDate(String registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+    public String getRelationshipHomeowner() {
+        return relationshipHomeowner;
+    }
+
+    public void setRelationshipHomeowner(String relationshipHomeowner) {
+        this.relationshipHomeowner = relationshipHomeowner;
+    }
+
+    public String getRentalPurposes() {
+        return rentalPurposes;
+    }
+
+    public void setRentalPurposes(String rentalPurposes) {
+        this.rentalPurposes = rentalPurposes;
+    }
+
+    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 getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
+
+    public int getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(int roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    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 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 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 getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java

@@ -27,6 +27,8 @@ import com.sucstepsoft.realtimelocation.beans.NewBuildingBean;
 import com.sucstepsoft.realtimelocation.beans.NewBuildingDetailBean;
 import com.sucstepsoft.realtimelocation.beans.NewCommunityBean;
 import com.sucstepsoft.realtimelocation.beans.NewCommunityDetailBean;
+import com.sucstepsoft.realtimelocation.beans.NewHouseBean;
+import com.sucstepsoft.realtimelocation.beans.NewHouseDetailBean;
 import com.sucstepsoft.realtimelocation.beans.NewsListBean;
 import com.sucstepsoft.realtimelocation.beans.PenLineBean;
 import com.sucstepsoft.realtimelocation.beans.PenNewLineBean;
@@ -1516,6 +1518,49 @@ public interface LocationApiService {
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
     @PUT("app/residential/updateresidential/{residentialId}")
     Observable<SuccessBean> doEditNewComunity(@Path("residentialId") String id, @Body RequestBody body, @Header("token") String token);
+    /*==================================TODO=========房屋===========================================*/
+
+    /**
+     * 保存楼宇信息
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @POST("app/house/save")
+    Observable<SuccessBean> doSaveNewHouse(@Body RequestBody body, @Header("token") String token);
+
+    /**
+     * 获取楼宇详情
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/house/get/{houseId}")
+    Observable<NewHouseDetailBean> getNewHouseDetail(@Path("houseId") String id, @Header("token") String token);
+
+
+    /**
+     * 获取楼宇列表
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/house/listpage")
+    Observable<NewHouseBean> getNewHouseList(
+            @Query("page") String page,
+            @Query("keywords") String keywords,
+            @Header("token") String token);
+
+
+    /**
+     * 删除楼宇
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @DELETE("app/house/remove/{ids}")
+    Observable<SuccessBean> doDelNewHouse(@Path("ids") String id, @Header("token") String token);
+
+
+    /**
+     * 修改楼宇信息
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @PUT("app/house/updatehouse/{houseId}")
+    Observable<SuccessBean> doEditNewHouse(@Path("houseId") String id, @Body RequestBody body, @Header("token") String token);
+
 
 
     /*==================================TODO=========楼宇管理===========================================*/
@@ -1534,6 +1579,13 @@ public interface LocationApiService {
     @GET("app/building/get/{buildingId}")
     Observable<NewBuildingDetailBean> getNewBuildingDetail(@Path("buildingId") String id, @Header("token") String token);
 
+    /**
+     * 根据小区获取楼宇列表
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/building/list")
+    Observable<List<NewBuildingBean.RowsBean>> getAllBuilding(@Query("residentialId") String id, @Header("token") String token);
+
     /**
      * 获取楼宇列表
      */

app/src/main/res/layout/activity_add_new_house.xml

@@ -1,290 +1,666 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:overScrollMode="never"
     android:scrollbars="none">
 
+
     <LinearLayout
+        android:id="@+id/ll_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
 
         <LinearLayout
-            android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="基础信息"
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
 
-                <TextView
+                <LinearLayout style="@style/item_white_bottom_border">
-                    style="@style/issue_report_title"
-                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
-                    android:drawablePadding="5dp"
-                    android:padding="8dp"
-                    android:text="基础信息"
-                    android:textStyle="bold" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="20dp">
-
-                    <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        style="@style/item_title_wrap"
-                            android:text="街道" />
+                        android:text="街道" />
 
-                        <ImageView
+                    <ImageView
-                            style="@style/style_hint_star"
+                        style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical" />
 
-                        <TextView
+                    <TextView
-                            android:id="@+id/tv_street"
+                        android:id="@+id/tv_street"
-                            style="@style/sel_text_arrow"
+                        style="@style/sel_text_arrow"
-                            android:hint="请选择所在街道" />
+                        android:hint="请选择所在街道" />
-                    </LinearLayout>
+                </LinearLayout>
 
-                    <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        style="@style/item_title_wrap"
-                            android:text="社区" />
+                        android:text="社区" />
 
-                        <ImageView
+                    <ImageView
-                            style="@style/style_hint_star"
+                        style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical" />
 
-                        <TextView
+                    <TextView
-                            android:id="@+id/tv_community"
+                        android:id="@+id/tv_community"
-                            style="@style/sel_text_arrow"
+                        style="@style/sel_text_arrow"
-                            android:hint="请选择所在社区" />
+                        android:hint="请选择所在社区" />
-                    </LinearLayout>
+                </LinearLayout>
 
-                    <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        style="@style/item_title_wrap"
-                            android:text="小区" />
+                        android:text="小区" />
 
-                        <ImageView
+                    <ImageView
-                            style="@style/style_hint_star"
+                        style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical" />
 
-                        <TextView
+                    <TextView
-                            android:id="@+id/tv_community_area"
+                        android:id="@+id/tv_community_area"
-                            style="@style/sel_text_arrow"
+                        style="@style/sel_text_arrow"
-                            android:hint="请选择所在小区" />
+                        android:hint="请选择所在小区" />
-                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
-                    <LinearLayout style="@style/item_white_bottom_border">
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="楼/排" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_building_num"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择所在楼/排" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        style="@style/item_title_wrap"
-                            android:text="楼排名称" />
+                        android:text="单元/列" />
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical" />
-
-                        <EditText
-                            android:id="@+id/et_name"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入楼排名称"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        android:id="@+id/tv_unit_num"
-                            android:text="楼/排号" />
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择所在单元/列" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <EditText
+                    <TextView
-                            android:id="@+id/et_num"
+                        style="@style/item_title_wrap"
-                            style="@style/item_content"
+                        android:text="层/院" />
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入楼排号"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_white_bottom_border">
 
 
-                        <TextView
+                    <TextView
-                            style="@style/item_title_wrap"
+                        android:id="@+id/tv_floor_num"
-                            android:text="楼层数" />
+                        style="@style/sel_text_arrow"
-
+                        android:hint="请选择所在层" />
-
-                        <EditText
-                            android:id="@+id/et_floor"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入楼层数"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_white_bottom_border">
-
-
-                        <TextView
-                            style="@style/item_title_wrap"
-                            android:text="单元/排数" />
-
-
-                        <EditText
-                            android:id="@+id/et_unit_num"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入单元/排数"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-
-                    <LinearLayout style="@style/item_white_bottom_border">
-
-
-                        <TextView
-                            style="@style/item_title_wrap"
-                            android:layout_gravity="center_vertical"
-                            android:text="详细地址" />
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical"
-                            android:visibility="gone" />
-
-                        <EditText
-                            android:id="@+id/et_address"
-                            style="@style/item_content_match"
-                            android:hint="请输入详细地址" />
-
-                    </LinearLayout>
-
                 </LinearLayout>
 
 
-                <TextView
+                <LinearLayout style="@style/item_white_bottom_border">
-                    style="@style/issue_report_title"
-                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
-                    android:drawablePadding="5dp"
-                    android:padding="8dp"
-                    android:text="地理位置"
-                    android:textStyle="bold" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="20dp"
-                    android:paddingBottom="10dp">
-
-                    <LinearLayout style="@style/item_white_ver">
 
 
-                        <TextView
+                    <TextView
-                            android:id="@+id/tv_loc_lng"
+                        style="@style/item_title_wrap"
-                            style="@style/item_title_wrap"
+                        android:text="门牌号" />
-                            android:layout_width="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:drawableRight="@drawable/ic_arrow_sort_gray"
-                            android:text="地图位置(点击进行地图选址)" />
 
 
-                        <com.sucstepsoft.realtimelocation.widget.NoScrollMapView
+                    <EditText
-                            android:layout_width="match_parent"
+                        android:id="@+id/et_door"
-                            android:layout_height="200dp"
+                        style="@style/item_content"
-                            android:layout_marginTop="5dp">
+                        android:layout_gravity="center_vertical"
-
+                        android:hint="请输入门牌号"
-                            <com.baidu.mapapi.map.TextureMapView
+                        android:inputType="number" />
-                                android:id="@+id/mp_view"
-                                android:layout_width="match_parent"
-                                android:layout_height="200dp" />
-
-
-                        </com.sucstepsoft.realtimelocation.widget.NoScrollMapView>
-
-                        <TextView
-                            android:id="@+id/tv_point"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@color/gray_fa"
-                            android:padding="5dp"
-                            android:textColor="@color/black"
-                            tools:text="坐标:22222223413241234" />
-                    </LinearLayout>
-
                 </LinearLayout>
 
 
-                <TextView
+                <LinearLayout style="@style/item_white_bottom_border">
-                    style="@style/issue_report_title"
-                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
-                    android:drawablePadding="5dp"
-                    android:padding="8dp"
-                    android:text="图像信息"
-                    android:textStyle="bold" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="20dp"
-                    android:paddingBottom="10dp">
 
-                    <LinearLayout style="@style/item_white_ver">
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋类别" />
 
-                        <TextView
+                    <ImageView
-                            style="@style/item_title_wrap"
+                        style="@style/style_hint_star"
-                            android:layout_gravity="center_vertical"
+                        android:layout_gravity="center_vertical" />
-                            android:text="照片" />
-
-                        <android.support.v7.widget.RecyclerView
-                            android:id="@+id/rlv_photo"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/shape_rectangle_gray_5" />
-                    </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/tv_house_type"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择所房屋类别" />
+                </LinearLayout>
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋性质" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_house_property"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择房屋性质" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋种类" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_house_kind"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择房屋种类" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋结构" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_house_frame"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择房屋结构" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="建筑用途" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_build_use"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择建筑用途" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋用途" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_house_use"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择房屋用途" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="隐患类型" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_trouble"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择隐患类型" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房间数量" />
+
+
+                    <EditText
+                        android:id="@+id/et_house_number"
+                        style="@style/item_content"
+                        android:layout_gravity="center_vertical"
+                        android:hint="请输入房间数量"
+                        android:inputType="number" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="房屋面积" />
+
+
+                    <EditText
+                        android:id="@+id/et_house_area"
+                        style="@style/item_content"
+                        android:layout_gravity="center_vertical"
+                        android:hint="请输入房屋面积"
+                        android:inputType="textMultiLine" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="产权证号" />
+
+
+                    <EditText
+                        android:id="@+id/et_right_num"
+                        style="@style/item_content"
+                        android:layout_gravity="center_vertical"
+                        android:hint="请输入产权证号"
+                        android:inputType="textMultiLine" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="登记日期" />
+
+
+                    <TextView
+                        android:id="@+id/tv_register_date"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择登记日期" />
+                </LinearLayout>
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="所属单位" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_dept"
+                        style="@style/item_content_match"
+                        android:hint="请输入所属单位" />
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="是否出租屋" />
+
+
+                    <Switch
+                        android:id="@+id/sw_is_hire"
+                        style="@style/item_switch" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="是否空置房" />
+
+
+                    <Switch
+                        android:id="@+id/sw_is_empty"
+                        style="@style/item_switch" />
                 </LinearLayout>
 
 
-                <Button
-                    android:id="@+id/btn_confirm"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="15dp"
-                    android:background="@drawable/sel_btn_submit"
-                    android:minHeight="0dp"
-                    android:padding="10dp"
-                    android:text="保&#160;&#160;&#160;&#160;存"
-                    android:textColor="@color/white"
-                    android:textSize="17sp" />
             </LinearLayout>
+
+
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="租住情况"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="租住类型" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_renting_type"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择租住类型" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="出租用途" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_hire_use"
+                        style="@style/item_content_match"
+                        android:hint="请输入出租用途" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="房主"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="房主姓名" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_owner_name"
+                        style="@style/item_content_match"
+                        android:hint="请输入房主姓名" />
+                </LinearLayout>
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="证件种类" />
+
+
+                    <TextView
+                        android:id="@+id/tv_owner_id_card_type"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择证件种类" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="证件号码" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_owner_id_card"
+                        style="@style/item_content_match"
+                        android:hint="请输入房主证件号码" />
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="联系电话" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_owner_phone"
+                        style="@style/item_content_match"
+                        android:hint="请输入房主联系电话" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="托管人"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="托管人姓名" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_manage_name"
+                        style="@style/item_content_match"
+                        android:hint="请输入托管人姓名" />
+                </LinearLayout>
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="证件种类" />
+
+
+                    <TextView
+                        android:id="@+id/tv_manage_id_card_type"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择证件种类" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="证件号码" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_manage_id_card"
+                        style="@style/item_content_match"
+                        android:hint="请输入托管人证件号码" />
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="联系电话" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_manage_phone"
+                        style="@style/item_content_match"
+                        android:hint="请输入托管人联系电话" />
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:layout_gravity="center_vertical"
+                        android:text="与房主关系" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <EditText
+                        android:id="@+id/et_manage_relation"
+                        style="@style/item_content_match"
+                        android:hint="请输入与房主关系" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <Button
+                android:id="@+id/btn_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="15dp"
+                android:background="@drawable/sel_btn_submit"
+                android:minHeight="0dp"
+                android:padding="10dp"
+                android:text="保&#160;&#160;&#160;&#160;存"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
         </LinearLayout>
 
     </LinearLayout>

app/src/main/res/layout/activity_new_house_detail.xml

@@ -1,214 +1,586 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:overScrollMode="never"
     android:scrollbars="none">
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            style="@style/issue_report_title"
+            android:drawableLeft="@drawable/ic_item_title_icon_rec"
+            android:drawablePadding="5dp"
+            android:padding="8dp"
+            android:text="基础信息"
+            android:textStyle="bold" />
 
         <LinearLayout
-            android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
 
-            <android.support.v7.widget.CardView
+            <LinearLayout style="@style/item_white_bottom_border">
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                app:cardCornerRadius="5dp"
-                app:cardPreventCornerOverlap="true"
-                app:cardUseCompatPadding="false">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            style="@style/issue_report_title"
-                            android:padding="8dp"
-                            android:text="房屋信息"
-                            android:textStyle="bold" />
-
-                        <ImageView
-                            android:id="@+id/iv_del"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginRight="10dp"
-                            android:scaleType="fitXY"
-                            android:src="@drawable/ic_del_char" />
-
-                    </RelativeLayout>
 
 
-                    <LinearLayout style="@style/item_gray">
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="街道" />
 
 
-                        <TextView
+                <TextView
-                            style="@style/item_title"
+                    android:id="@+id/tv_street"
-                            android:text="房屋名称" />
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
 
-                        <View style="@style/vertical_line" />
+            <LinearLayout style="@style/item_white_bottom_border">
-
-                        <TextView
-                            android:id="@+id/tv_build_num"
-                            style="@style/sel_text_show"
-                            android:hint="未录入" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
 
 
-                        <TextView
+                <TextView
-                            style="@style/item_title"
+                    style="@style/item_title_wrap"
-                            android:text="房主姓名" />
+                    android:text="社区" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_owner_name"
-                            style="@style/sel_text_show"
-                            android:hint="未录入" />
-                    </LinearLayout>
-
-                    <!--                    <LinearLayout style="@style/item_gray">-->
 
 
-                    <!--                        <TextView-->
+                <TextView
-                    <!--                            style="@style/item_title"-->
+                    android:id="@+id/tv_community"
-                    <!--                            android:text="房主身份证" />-->
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
 
-                    <!--                        <View style="@style/vertical_line" />-->
+            <LinearLayout style="@style/item_white_bottom_border">
-
-                    <!--                        <TextView-->
-                    <!--                            android:id="@+id/tv_owner_card"-->
-                    <!--                            style="@style/sel_text_show"-->
-                    <!--                            android:hint="未录入" />-->
-                    <!--                    </LinearLayout>-->
-
-                    <LinearLayout style="@style/item_gray">
 
 
-                        <TextView
+                <TextView
-                            style="@style/item_title"
+                    style="@style/item_title_wrap"
-                            android:text="房主联系方式" />
+                    android:text="小区" />
 
-                        <View style="@style/vertical_line" />
 
-                        <TextView
+                <TextView
-                            android:id="@+id/tv_owner_phone"
+                    android:id="@+id/tv_community_area"
-                            style="@style/sel_text_show"
+                    style="@style/sel_text_arrow_text" />
-                            android:hint="未录入" />
+            </LinearLayout>
-                    </LinearLayout>
 
-                    <LinearLayout style="@style/item_gray">
+            <LinearLayout style="@style/item_white_bottom_border">
 
-                        <TextView
-                            style="@style/item_title"
-                            android:text="房屋状态" />
 
-                        <View style="@style/vertical_line" />
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="楼/排" />
+
+
+                <TextView
+                    android:id="@+id/tv_building_num"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="单元/列" />
+
+
+                <TextView
+                    android:id="@+id/tv_unit_num"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="层/院" />
+
+
+                <TextView
+                    android:id="@+id/tv_floor_num"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="门牌号" />
+
+
+                <TextView
+                    android:id="@+id/tv_door"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋类别" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_type"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋性质" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_property"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋种类" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_kind"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋结构" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_frame"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="建筑用途" />
+
+
+                <TextView
+                    android:id="@+id/tv_build_use"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋用途" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_use"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="隐患类型" />
+
+
+                <TextView
+                    android:id="@+id/tv_trouble"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房间数量" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_number"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="房屋面积" />
+
+
+                <TextView
+                    android:id="@+id/tv_house_area"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="产权证号" />
+
+
+                <TextView
+                    android:id="@+id/tv_right_num"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="登记日期" />
+
+
+                <TextView
+                    android:id="@+id/tv_register_date"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="所属单位" />
+
+
+                <TextView
+                    android:id="@+id/tv_dept"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="是否出租屋" />
+
+
+                <Switch
+                    android:id="@+id/sw_is_hire"
+                    style="@style/item_switch"
+                    android:enabled="false" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="是否空置房" />
+
+
+                <Switch
+                    android:id="@+id/sw_is_empty"
+                    style="@style/item_switch"
+                    android:enabled="false" />
+            </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/tv_type"
-                            style="@style/sel_text_show"
-                            android:hint="未录入" />
-                    </LinearLayout>
 
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
         </LinearLayout>
 
+
+        <TextView
+            style="@style/issue_report_title"
+            android:drawableLeft="@drawable/ic_item_title_icon_rec"
+            android:drawablePadding="5dp"
+            android:padding="8dp"
+            android:text="租住情况"
+            android:textStyle="bold" />
+
         <LinearLayout
-            android:id="@+id/ll_person"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="10dp">
 
-            <android.support.v7.widget.CardView
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="租住类型" />
+
+
+                <TextView
+                    android:id="@+id/tv_renting_type"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="出租用途" />
+
+
+                <TextView
+                    android:id="@+id/tv_hire_use"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+        <TextView
+            style="@style/issue_report_title"
+            android:drawableLeft="@drawable/ic_item_title_icon_rec"
+            android:drawablePadding="5dp"
+            android:padding="8dp"
+            android:text="房主"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="10dp">
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="房主姓名" />
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:layout_gravity="center_vertical"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/tv_owner_name"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="证件种类" />
+
+
+                <TextView
+                    android:id="@+id/tv_owner_id_card_type"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="证件号码" />
+
+
+                <TextView
+                    android:id="@+id/tv_owner_id_card"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="联系电话" />
+
+
+                <TextView
+                    android:id="@+id/tv_owner_phone"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+        <TextView
+            style="@style/issue_report_title"
+            android:drawableLeft="@drawable/ic_item_title_icon_rec"
+            android:drawablePadding="5dp"
+            android:padding="8dp"
+            android:text="托管人"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="10dp">
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="托管人姓名" />
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:layout_gravity="center_vertical"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/tv_manage_name"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:text="证件种类" />
+
+
+                <TextView
+                    android:id="@+id/tv_manage_id_card_type"
+                    style="@style/sel_text_arrow_text" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="证件号码" />
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:layout_gravity="center_vertical"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/tv_manage_id_card"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="联系电话" />
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:layout_gravity="center_vertical"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/tv_manage_phone"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+            <LinearLayout style="@style/item_white_bottom_border">
+
+
+                <TextView
+                    style="@style/item_title_wrap"
+                    android:layout_gravity="center_vertical"
+                    android:text="与房主关系" />
+
+
+                <TextView
+                    android:id="@+id/tv_manage_relation"
+                    style="@style/sel_text_arrow_text" />
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginTop="10dp"
-                app:cardCornerRadius="5dp"
+                android:layout_marginBottom="10dp"
-                app:cardPreventCornerOverlap="true"
+                android:orientation="horizontal">
-                app:cardUseCompatPadding="false">
 
-                <LinearLayout
+                <Button
-                    android:layout_width="match_parent"
+                    android:id="@+id/btn_del"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_weight="1"
+                    android:background="@drawable/sel_btn_gray_white"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp"
+                    android:padding="5dp"
+                    android:text="删除"
+                    android:textColor="@color/col_gray_black" />
 
-                    <RelativeLayout
+                <Button
-                        android:layout_width="match_parent"
+                    android:id="@+id/btn_edit"
-                        android:layout_height="wrap_content"
+                    android:layout_width="0dp"
-                        android:orientation="horizontal">
+                    android:layout_height="wrap_content"
-
+                    android:layout_marginLeft="10dp"
-                        <TextView
+                    android:layout_weight="1"
-                            style="@style/issue_report_title"
+                    android:background="@drawable/sel_btn_blue_gray"
-                            android:padding="8dp"
+                    android:minWidth="0dp"
-                            android:text="居住人员"
+                    android:minHeight="0dp"
-                            android:textStyle="bold" />
+                    android:padding="5dp"
-
+                    android:text="编辑"
-                        <Button
+                    android:textColor="@color/col_white_black" />
-                            android:id="@+id/btn_confirm"
+            </LinearLayout>
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="10dp"
-                            android:background="@drawable/sel_btn_submit"
-                            android:minWidth="0dp"
-                            android:minHeight="0dp"
-                            android:paddingLeft="5dp"
-                            android:paddingTop="2dp"
-                            android:paddingRight="5dp"
-                            android:paddingBottom="2dp"
-                            android:text="添加人员"
-                            android:textColor="@color/white"
-                            android:textSize="17sp" />
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/shp_rectangle_gray"
-                        android:orientation="vertical"
-                        android:padding="2dp">
-
-                        <TextView
-                            android:id="@+id/tv_hint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:paddingTop="20dp"
-                            android:paddingBottom="20dp"
-                            android:text="暂无居住人员信息" />
-
-                        <android.support.v7.widget.RecyclerView
-                            android:id="@+id/rlv_person"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-                    </RelativeLayout>
-
-
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
         </LinearLayout>
     </LinearLayout>
+
+
 </android.support.v4.widget.NestedScrollView>

app/src/main/res/layout/item_community_sel_new.xml

@@ -34,7 +34,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/shp_status_shallow_red"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:paddingLeft="8dp"
                 android:paddingTop="2dp"
                 android:paddingRight="8dp"
@@ -49,7 +51,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:background="@drawable/shp_status_shallow_red"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:paddingLeft="5dp"
                 android:paddingTop="2dp"
                 android:paddingRight="5dp"
@@ -57,21 +61,42 @@
                 android:textColor="@color/red_ff"
                 android:textSize="14dp"
                 tools:text="社区名称" />
+
             <TextView
                 android:id="@+id/tv_unit"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:background="@drawable/shp_status_shallow_red"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:paddingLeft="5dp"
                 android:paddingTop="2dp"
                 android:paddingRight="5dp"
-                android:visibility="gone"
                 android:paddingBottom="2dp"
                 android:textColor="@color/red_ff"
                 android:textSize="14dp"
-                tools:text="小区" />
+                android:visibility="gone"
+                tools:text="小区小区小区小区小区小区小区小区小区小区小区小区小区小区" />
+
+            <TextView
+                android:id="@+id/tv_building"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/shp_status_shallow_red"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:paddingLeft="5dp"
+                android:paddingTop="2dp"
+                android:paddingRight="5dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/red_ff"
+                android:textSize="14dp"
+                android:visibility="gone"
+                tools:text="楼宇" />
 
         </LinearLayout>
 

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -47,7 +47,7 @@ public class PathConfig {
     public static final String DEFAULT_AREA_3 = "752234";//默认三级地区  高新区
     //=========================字典ID===================================
     public static final String DIC_RELATION = "4c21d91a-d5e1-4cfc-a18a-d63272763cdb";//与户主关系
-    public static final String DIC_CARD_TYPE = "360d6062-754d-4d43-95ba-cb9938102050";//证件类型
+    public static final String DIC_CARD_TYPE = "76c5044f-805a-4313-b1e8-79e966b97c0d";//证件类型
     public static final String DIC_GENDER = "4ef46940-76ab-4758-b5f0-0cbc93ffc660";//性别
 
     public static final String DIC_HOUSE_TYPE = "";//住所类型
@@ -122,7 +122,8 @@ public class PathConfig {
     public static final String DIC_TALK = "3d6a1b33-5cdd-4c60-b5ef-39a8019e6c2e";
 
 
-    public static final String DIC_NEW_HOUSE_TYPE="087bd132-aa9a-4468-9f94-309b4dea4aaa";
+    public static final String DIC_NEW_HOUSE_TYPE = "087bd132-aa9a-4468-9f94-309b4dea4aaa";
+    public static final String DIC_BUILDING_HOUSE_TYPE = "d6cceb30-cbb9-4c77-9139-38d4849d1580";
 
     /**
      * 请假外出市五区外
@@ -292,4 +293,15 @@ public class PathConfig {
     public static final String DIC_RISK_TYPE = "793bbd90-bab5-44a1-b78f-aead61411ef6";//风险类型
     public static final String DIC_PERSON_TYPE = "d327f3b1-7c5f-4b4f-94fb-78158096ccc6";//当事人人员类别
     public static final String DIC_RESOLVE_WAY = "68b0ec93-3981-4c12-bff6-0ae718bd0a9a";//化解方式
+    public static final String DIC_BUILDING_HOUSE_PROPERTY = "79f90a8c-f94f-4381-b484-bf02d5b9bfd4";//房屋性质
+    public static final String DIC_BUILDING_HOUSE_KIND = "934bb545-cb49-4efe-8cb2-63af41d7b68d";//房屋种类
+
+    public static final String DIC_BUILDING_HOUSE_FRAME = "bad48aba-472e-43de-8a79-5bc47886a8b5";//房屋结构
+
+    public static final String DIC_BUILDING_BUILD_USE = "c1d5ea4f-a6ff-4201-ab2c-674df8fea0be";//建筑用途
+    public static final String DIC_BUILDING_HOUSE_USE = "175af8a5-d0fc-46c1-90a7-420179faadbb";//房屋用途
+
+    public static final String DIC_BUILDING_HOUSE_TROUBLE = "34950d66-88dc-4028-9c40-8e580bf24f1a";//隐患类型
+
+    public static final String DIC_RENTING_TYPE = "df35f694-dc5d-4224-b64a-a381249b325d";//租住类型
 }