刑满释放

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/normal/CensusRegisterDetailActivity.java

@@ -13,6 +13,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusCorrctListActivity;
+import com.sucstepsoft.realtimelocation.activitys.census.special.CensusSpecialCriminalListActivity;
 import com.sucstepsoft.realtimelocation.beans.OperateBean;
 import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
@@ -238,13 +239,15 @@ public class CensusRegisterDetailActivity extends BaseActivity {
         popup.addOnCheckChange((bean) -> {
             popup.dismiss();
             Intent intent = new Intent();
-            intent.putExtra("id", mRegisterDetailBean.getPopulationInfoId());
+            intent.putExtra("idCard", mRegisterDetailBean.getPopulationInfoId());
             switch (bean.getId()) {
                 case "1"://社区矫正
                     intent.setClass(mActivity, CensusCorrctListActivity.class);
                     startActivity(intent);
                     break;
-                case "2":
+                case "2"://刑满释放
+                    intent.setClass(mActivity, CensusSpecialCriminalListActivity.class);
+                    startActivity(intent);
                     break;
                 case "3":
                     break;

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrctListActivity.java

@@ -61,13 +61,15 @@ public class CensusCorrctListActivity extends BaseActivity {
         mTvBaseTitle.setText("社区矫正");
         mTvPublish.setVisibility(View.VISIBLE);
         mTvPublish.setText("新增");
+        mId = getIntent().getStringExtra("idCard");
         mTvPublish.setOnClickListener(v -> {
             Intent intent = new Intent(mActivity, CensusCorrectAddActivity.class);
             intent.putExtra("title", "社区矫正信息录入");
+            intent.putExtra("idCard", mId);
             startActivity(intent);
         });
 
-        mId = getIntent().getStringExtra("id");
+
 //        mBtnSearch.setOnClickListener(v -> doSearch());
 //        mIvClear.setOnClickListener(v -> {
 //            mKeywords = "";

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrectAddActivity.java

@@ -124,7 +124,7 @@ public class CensusCorrectAddActivity extends BaseActivity {
             getDetailById(mId);
         } else {
             //新增
-            mLlSearchContent.setVisibility(View.VISIBLE);
+            mLlSearchContent.setVisibility(View.GONE);
         }
         mTvBaseTitle.setText(title);
         mBtnSearch.setOnClickListener(v -> doSearchPerson());

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCrimianlDetailActivity.java

@@ -1,6 +1,9 @@
 package com.sucstepsoft.realtimelocation.activitys.census.special;
 
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -9,7 +12,9 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.beans.SearchBaseInfoBean;
+import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CensusCrimeDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
 
@@ -25,62 +30,49 @@ import io.reactivex.schedulers.Schedulers;
 
 public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
 
-    //基础信息
-    @BindView(R.id.tv_base_name)
-    TextView mTvBaseName;//姓名
-    @BindView(R.id.tv_base_former_name)
-    TextView mTvBaseFormerName;//曾用名
-    @BindView(R.id.tv_base_gender)
-    TextView mTvBaseGender;//性别
-    @BindView(R.id.tv_base_id_card)
-    TextView mTvBaseIdCard;//身份证
-    @BindView(R.id.tv_base_phone)
-    TextView mTvBasePhone;//联系电话
-    @BindView(R.id.tv_base_native)
-    TextView mTvBaseNative;//籍贯
-    @BindView(R.id.tv_base_nation)
-    TextView mTvBaseNation;//名族
-    @BindView(R.id.tv_base_cur_loc)
-    TextView mTvBaseCurLoc;//现住址
-    @BindView(R.id.tv_base_cur_address)
-    TextView mTvBaseCurAddress;//现住址详情
-    //详情
-    @BindView(R.id.sw_crime)
-    Switch mSwCrime;//是否累犯
-    @BindView(R.id.tv_charge)
-    TextView mTvCharge;//原罪名
-    @BindView(R.id.et_prison_term)
-    TextView mEtPrisonTerm;//原判刑期
-    @BindView(R.id.et_prison_place)
-    TextView mEtPrisonPlace;//服刑场所
-    @BindView(R.id.tv_release_date)
-    TextView mTvReleaseDate;//释放日期
-    @BindView(R.id.tv_assess)
-    TextView mTvAssess;//危险评估
-    @BindView(R.id.tv_join_date)
-    TextView mTvJoinDate;//衔接日期
-    @BindView(R.id.tv_join_case)
-    TextView mTvJoinCase;//衔接情况
-    @BindView(R.id.tv_put_date)
-    TextView mTvPutDate;//安置日期
-    @BindView(R.id.tv_put_case)
-    TextView mTvPutCase;//安置情况
-    @BindView(R.id.et_unput_case)
-    TextView mEtUnputCase;//未安置原因
-    @BindView(R.id.tv_help_case)
-    TextView mTvHelpCase;//帮扶情况
-    @BindView(R.id.sw_is_recirme)
-    Switch mSwIsRecirme;//是否重新犯罪
-    @BindView(R.id.et_cirme_name)
-    TextView mEtCirmeName;//重新犯罪罪名
-    private Unbinder mBind;
-    private SearchBaseInfoBean mBaseInfo;
-    private CensusCrimeDetailBean mDetailBean;
 
-    @Override
+
-    protected int setLayoutId() {
+    @BindView(R.id.et_search_id_card)
-        return R.layout.activity_census_special_crimianl_detail;
+    EditText mEtSearchIdCard;
-    }
+    @BindView(R.id.iv_clear)
+    ImageView mIvClear;
+    @BindView(R.id.btn_search)
+    Button mBtnSearch;
+    @BindView(R.id.ll_search_content)
+    LinearLayout mLlSearchContent;
+    @BindView(R.id.tv_base_name)
+    TextView mTvBaseName;
+    @BindView(R.id.tv_base_gender)
+    TextView mTvBaseGender;
+    @BindView(R.id.tv_base_phone)
+    TextView mTvBasePhone;
+    @BindView(R.id.tv_base_native)
+    TextView mTvBaseNative;
+    @BindView(R.id.tv_base_cur_loc)
+    TextView mTvBaseCurLoc;
+    @BindView(R.id.cv_base_info)
+    LinearLayout mCvBaseInfo;
+    @BindView(R.id.tv_crime_name)
+    TextView mTvCrimeName;
+    @BindView(R.id.tv_prison_term)
+    TextView mTvPrisonTerm;
+    @BindView(R.id.tv_correct_type)
+    TextView mTvCorrectType;
+    @BindView(R.id.et_manage_dept)
+    TextView mEtManageDept;
+    @BindView(R.id.tv_manage_date)
+    TextView mTvManageDate;
+    @BindView(R.id.sw_is_soldier)
+    Switch mSwIsSoldier;
+    @BindView(R.id.tv_release_date)
+    TextView mTvReleaseDate;
+    @BindView(R.id.ll_content)
+    LinearLayout mLlContent;
+    private Unbinder mBind;
+    private BaseRegisterDetailBean mBaseInfo;
+    private CorrectDetailBean mDetailBean;
+
+
 
     @Override
     public void initData() {
@@ -99,40 +91,40 @@ public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
      * @param idCard
      */
     private void getDetailData(String id, String idCard) {
-        Observable<SearchBaseInfoBean> baseInfo = RetrofitManager.getInstance().create(LocationApiService.class).doSearchBaseInfoByIdCard(idCard, UserLgUtils.getToken());
+        Observable<BaseRegisterDetailBean> baseRegisterDetail = RetrofitManager.getInstance().create(LocationApiService.class).getBaseRegisterDetail(idCard, UserLgUtils.getToken());
-        Observable<CensusCrimeDetailBean> registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailById(id, UserLgUtils.getToken());
+        Observable<CorrectDetailBean> registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailById(id, UserLgUtils.getToken());
-        Observable.merge(baseInfo, registerInfo)
+        Observable.merge(baseRegisterDetail, registerInfo)
-            .subscribeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<Object>() {
+                .subscribe(new Observer<Object>() {
-                @Override
+                    @Override
-                public void onSubscribe(@NonNull Disposable d) {
+                    public void onSubscribe(@NonNull Disposable d) {
 
-                }
-
-                @Override
-                public void onNext(@NonNull Object o) {
-                    if (o instanceof SearchBaseInfoBean) {
-                        mBaseInfo = (SearchBaseInfoBean) o;
-                        setBaseInfo();
-                    } else if (o instanceof CensusCrimeDetailBean) {
-                        mDetailBean = (CensusCrimeDetailBean) o;
-                        setDataToView();
                     }
-                    refreshView(STATE_LOAD_SUCCESS);
-                }
 
-                @Override
+                    @Override
-                public void onError(@NonNull Throwable e) {
+                    public void onNext(@NonNull Object o) {
-                    ExceptionHandler.handleException(e);
+                        if (o instanceof BaseRegisterDetailBean) {
-                    refreshView(STATE_LOAD_ERROR);
+                            mBaseInfo = (BaseRegisterDetailBean) o;
-                }
+                            setBaseInfo();
+                        } else if (o instanceof CorrectDetailBean) {
+                            mDetailBean = (CorrectDetailBean) o;
+                            setDataToView();
+                        }
+                        refreshView(STATE_LOAD_SUCCESS);
+                    }
 
-                @Override
+                    @Override
-                public void onComplete() {
+                    public void onError(@NonNull Throwable e) {
+                        ExceptionHandler.handleException(e);
+                        refreshView(STATE_LOAD_ERROR);
+                    }
 
-                }
+                    @Override
-            });
+                    public void onComplete() {
+
+                    }
+                });
 
     }
 
@@ -140,35 +132,29 @@ public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
      * 基础信息
      */
     private void setBaseInfo() {
-        mTvBaseName.setText(mBaseInfo.getFullName());
+        mTvBaseName.setText(mBaseInfo.getName());
-        mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore());
+        mTvBaseGender.setText(mBaseInfo.getSex());
-        mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName());
+        mTvBasePhone.setText(mBaseInfo.getPhone());
-        mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证
+        mTvBaseNative.setText(mBaseInfo.getOriginAddress());
-        mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话
+        mTvBaseCurLoc.setText(mBaseInfo.getDomicileAreaName() + "/" + mBaseInfo.getDomicileAddress());
-        mTvBaseNative.setText(mBaseInfo.getNativePlaceAddr());//籍贯
-        mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族
-        mTvBaseCurLoc.setText(mBaseInfo.getAreaNames());//现住址
-        mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情
     }
 
     /**
      * 详细信息
      */
     private void setDataToView() {
-        mSwCrime.setChecked(mDetailBean.getIsCumulativeCrime().equals("1"));//是否累犯
+        mTvCrimeName.setText(mDetailBean.getCharge());
-        mTvCharge.setText(mDetailBean.getNameOfOriginalSinDictionaryName());//原罪名
+        mTvPrisonTerm.setText(mDetailBean.getPrisonTerm());
-        mEtPrisonTerm.setText(mDetailBean.getOriginalSentenceData());//原判刑期
+        mTvCorrectType.setText(mDetailBean.getType());
-        mEtPrisonPlace.setText(mDetailBean.getServingSentencePlace());//服刑场所
+        mEtManageDept.setText(mDetailBean.getOrganization());
-        mTvReleaseDate.setText(mDetailBean.getReleaseDate());//释放日期
+        mTvManageDate.setText(mDetailBean.getSuperviseTime());
-        mTvAssess.setText(mDetailBean.getAssessmentRiskTypeDictionaryName());//危险评估
+        mSwIsSoldier.setChecked("是".equals(mDetailBean.getIsRelease()));
-        mTvJoinDate.setText(mDetailBean.getLinkUpDate());//衔接日期
+        mTvReleaseDate.setText(mDetailBean.getReleaseTime());
-        mTvJoinCase.setText(mDetailBean.getLinkUpSituationDictionaryName());//衔接情况
+    }
-        mTvPutDate.setText(mDetailBean.getPlacementDate());//安置日期
+
-        mTvPutCase.setText(mDetailBean.getPlacementSituationDictionaryName());//安置情况
+    @Override
-        mEtUnputCase.setText(mDetailBean.getUnPlacementReason());//未安置原因
+    protected int setLayoutId() {
-        mTvHelpCase.setText(mDetailBean.getHelpAndEducate());//帮扶情况
+        return R.layout.activity_census_special_crimianl_detail;
-        mSwIsRecirme.setChecked(mDetailBean.getIsCrimeAgain().equals("1"));//是否重新犯罪
-        mEtCirmeName.setText(mDetailBean.getCrimeAgainCharge());//重新犯罪罪名
     }
 
 

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalAddActivity.java

@@ -24,6 +24,7 @@ import com.google.gson.Gson;
 import com.sucstepsoft.cm_utils.constant.PathConfig;
 import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.RegexUtils;
 import com.sucstepsoft.cm_utils.utils.ToastUtils;
 import com.sucstepsoft.cm_utils.utils.UIUtil;
@@ -34,8 +35,11 @@ import com.sucstepsoft.realtimelocation.adapters.DicSelAdapter;
 import com.sucstepsoft.realtimelocation.beans.DicBean;
 import com.sucstepsoft.realtimelocation.beans.SearchBaseInfoBean;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
+import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CensusCrimeDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CensusRegisterDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.SaveCorrectBean;
 import com.sucstepsoft.realtimelocation.beans.person.SaveCrimeBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.services.jpush.TagAliasOperatorHelper;
@@ -43,6 +47,7 @@ import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
 import com.sucstepsoft.realtimelocation.utils.ReadAssets;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
@@ -62,79 +67,55 @@ import okhttp3.RequestBody;
  */
 public class CensusSpecialCriminalAddActivity extends BaseActivity {
     //搜索布局
-    @BindView(R.id.ll_search_content)
-    LinearLayout mLlSearchContent;
     @BindView(R.id.et_search_id_card)
-    EditText mEtSearchIdCard;//搜索框
+    EditText mEtSearchIdCard;
-    @BindView(R.id.btn_search)
-    Button mBtnSearch;//收搜按钮
     @BindView(R.id.iv_clear)
     ImageView mIvClear;
-    //基础信息
+    @BindView(R.id.btn_search)
-    @BindView(R.id.cv_base_info)
+    Button mBtnSearch;
-    CardView mCvBaseInfo;//基础信息
+    @BindView(R.id.ll_search_content)
+    LinearLayout mLlSearchContent;
     @BindView(R.id.tv_base_name)
     TextView mTvBaseName;
     @BindView(R.id.tv_base_gender)
     TextView mTvBaseGender;
-    @BindView(R.id.tv_base_native)
-    TextView mTvBaseNative;
     @BindView(R.id.tv_base_phone)
     TextView mTvBasePhone;
+    @BindView(R.id.tv_base_native)
+    TextView mTvBaseNative;
     @BindView(R.id.tv_base_cur_loc)
     TextView mTvBaseCurLoc;
-
+    @BindView(R.id.cv_base_info)
-    //内容
+    LinearLayout mCvBaseInfo;
-    @BindView(R.id.sw_crime)
+    @BindView(R.id.et_crime_name)
-    Switch mSwCrime;//是否累犯
+    EditText mEtCrimeName;
-    @BindView(R.id.tv_charge)
-    TextView mTvCharge;//原罪名
     @BindView(R.id.et_prison_term)
-    EditText mEtPrisonTerm;//原判刑期
+    EditText mEtPrisonTerm;
-    @BindView(R.id.et_prison_place)
+    @BindView(R.id.tv_correct_type)
-    EditText mEtPrisonPlace;//服刑场所
+    TextView mTvCorrectType;
+    @BindView(R.id.et_manage_dept)
+    EditText mEtManageDept;
+    @BindView(R.id.tv_manage_date)
+    TextView mTvManageDate;
+    @BindView(R.id.sw_is_soldier)
+    Switch mSwIsSoldier;
     @BindView(R.id.tv_release_date)
-    TextView mTvReleaseDate;//释放日期
+    TextView mTvReleaseDate;
-    @BindView(R.id.tv_assess)
-    TextView mTvAssess;//危险评估
-    @BindView(R.id.tv_join_date)
-    TextView mTvJoinDate;//衔接日期
-    @BindView(R.id.tv_join_case)
-    TextView mTvJoinCase;//衔接情况
-    @BindView(R.id.tv_put_date)
-    TextView mTvPutDate;//安置日期
-    @BindView(R.id.tv_put_case)
-    TextView mTvPutCase;//安置情况
-    @BindView(R.id.et_unput_case)
-    EditText mEtUnputCase;//未安置原因
-    @BindView(R.id.tv_help_case)
-    EditText mTvHelpCase;//帮扶情况
-    @BindView(R.id.sw_is_recirme)
-    Switch mSwIsRecirme;//是否重新犯罪
-    @BindView(R.id.et_cirme_name)
-    EditText mEtCirmeName;//重新犯罪罪名
     @BindView(R.id.btn_confirm)
     Button mBtnConfirm;
     @BindView(R.id.ll_content)
     LinearLayout mLlContent;
+    private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private Unbinder mBind;
     private String mId;
-    private SearchBaseInfoBean mBaseInfoBean;
+    private BaseRegisterDetailBean mBaseInfoBean;
-    private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private boolean mIsRelease = false;
-    private List<DicBean> mChargeList;
+
-    private List<DicBean> mAssessList;
+    private List<DicBean> mCorrectTypeList;
-    private List<DicBean> mJoinCaseList;
+
-    private List<DicBean> mPutCaseList;
+
-    private OptionsPickerView<DicBean> mChargePicker;
+    private OptionsPickerView<DicBean> mCorrectTypePicker;
-    private OptionsPickerView<DicBean> mAssessPicker;
+    private String mIdCard;
-    private OptionsPickerView<DicBean> mJoinCasePicker;
-    private OptionsPickerView<DicBean> mPutCasePicker;
-    private boolean mIsCrime;//是否累犯
-    private boolean mIsReCrime;//是否重新犯罪
-    private String mSelAssess;
-    private String mSelJoinCase;
-    private String mPutCase;
-    private String mSelcharge;
 
     @Override
     protected int setLayoutId() {
@@ -148,6 +129,9 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
         mLlContent.setVisibility(View.INVISIBLE);
         //主键
         mId = getIntent().getStringExtra("id");
+        mIdCard = getIntent().getStringExtra("idCard");
+        LogUtils.e(mId+"==="+mIdCard);
+        //获取人员详情
         String title = getIntent().getStringExtra("title");
         if (!TextUtils.isEmpty(mId)) {
             //编辑
@@ -156,202 +140,55 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
             getDetailById(mId);
         } else {
             //新增
-            mLlSearchContent.setVisibility(View.VISIBLE);
+            mLlSearchContent.setVisibility(View.GONE);
-            refreshView(STATE_LOAD_SUCCESS);
         }
         mTvBaseTitle.setText(title);
         mBtnSearch.setOnClickListener(v -> doSearchPerson());
         mIvClear.setOnClickListener(v -> mEtSearchIdCard.setText(""));
+
+        DicBean d1 = new DicBean();
+        d1.setDictionaryName("宽管");
+        DicBean d2 = new DicBean();
+        d2.setDictionaryName("普管");
+        DicBean d3 = new DicBean();
+        d3.setDictionaryName("严管");
+
+        mCorrectTypeList = new ArrayList<>();
+        mCorrectTypeList.add(d1);
+        mCorrectTypeList.add(d2);
+        mCorrectTypeList.add(d3);
+        mTvCorrectType.setOnClickListener(v -> onShowCorrectType());
+        mTvManageDate.setOnClickListener(v -> onShowDate(mTvManageDate));
+        mTvReleaseDate.setOnClickListener(v -> onShowDate(mTvReleaseDate));
         mBtnConfirm.setOnClickListener(v -> doSubmit());
-
+        getPersonDetail();
-        mSwCrime.setOnCheckedChangeListener((buttonView, isChecked) -> mIsCrime = isChecked);
-        mSwIsRecirme.setOnCheckedChangeListener((buttonView, isChecked) -> mIsReCrime = isChecked);
-        mTvCharge.setOnClickListener(v -> onShowCharge());
-        mTvAssess.setOnClickListener(v -> onShowAssess());
-        mTvJoinCase.setOnClickListener(v -> onShowJoinCase());
-        mTvPutCase.setOnClickListener(v -> onShowPutCase());
-
-        mTvReleaseDate.setOnClickListener(v -> onShowDate(1));
-        mTvJoinDate.setOnClickListener(v -> onShowDate(2));
-        mTvPutDate.setOnClickListener(v -> onShowDate(3));
-
     }
 
     /**
-     * 安置情况
+     * 获取人员详情
      */
-    private void onShowPutCase() {
+    private void getPersonDetail() {
-        hideSoftKeyboard();
-        if (mPutCaseList != null && mPutCaseList.size() > 0) {
-            if (mPutCasePicker == null) {
-                mPutCasePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
-                    DicBean bean = mPutCaseList.get(o1);
-                    mTvPutCase.setText(bean.getDictionaryName());
-                    mPutCase = bean.getDictionaryId();
-                })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
-                mPutCasePicker.setPicker(mPutCaseList);
-            }
-            mPutCasePicker.show();
-        } else {
-            getDicListByType(PathConfig.DIC_AFTERCARE, 2);
-        }
-    }
-
-    /**
-     * 衔接情况
-     */
-    private void onShowJoinCase() {
-        hideSoftKeyboard();
-        if (mJoinCaseList != null && mJoinCaseList.size() > 0) {
-            if (mJoinCasePicker == null) {
-                mJoinCasePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
-                    DicBean bean = mJoinCaseList.get(o1);
-                    mTvJoinCase.setText(bean.getDictionaryName());
-                    mSelJoinCase = bean.getDictionaryId();
-                })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
-                mJoinCasePicker.setPicker(mJoinCaseList);
-            }
-            mJoinCasePicker.show();
-        } else {
-            getDicListByType(PathConfig.DIC_LINK_UP, 3);
-        }
-    }
-
-    /**
-     * 危险评估
-     */
-    private void onShowAssess() {
-        hideSoftKeyboard();
-        if (mAssessList != null && mAssessList.size() > 0) {
-            if (mAssessPicker == null) {
-                mAssessPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
-                    DicBean bean = mAssessList.get(o1);
-                    mSelAssess = bean.getDictionaryId();
-                    mTvAssess.setText(bean.getDictionaryName());
-                })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
-                mAssessPicker.setPicker(mAssessList);
-            }
-            mAssessPicker.show();
-        } else {
-            getDicListByType(PathConfig.DIC_RISK, 4);
-        }
-    }
-
-    /**
-     * 日期
-     * 1 释放日期  2衔接日期  3释放日期
-     */
-    private void onShowDate(int i) {
-        hideSoftKeyboard();
-        TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> {
-            switch (i) {
-                case 1:
-                    mTvReleaseDate.setText(mDateFormat.format(date));
-                    break;
-                case 2:
-                    mTvJoinDate.setText(mDateFormat.format(date));
-                    break;
-                case 3:
-                    mTvPutDate.setText(mDateFormat.format(date));
-                    break;
-            }
-        })
-                .setTitleText("请选日期")
-                .setCancelColor(Color.parseColor("#1189FF"))
-                .setSubmitColor(Color.parseColor("#1189FF"))
-                .setType(new boolean[]{true, true, true, false, false, false})
-                .setTitleColor(Color.parseColor("#1189FF"))
-                .build();
-        mTimePickerView.show();
-    }
-
-    /**
-     * 罪名
-     */
-    private void onShowCharge() {
-        hideSoftKeyboard();
-        if (mChargeList != null && mChargeList.size() > 0) {
-            if (mChargePicker == null) {
-                mChargePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
-                    DicBean bean = mChargeList.get(o1);
-                    mTvCharge.setText(bean.getDictionaryName());
-                    mSelcharge = bean.getDictionaryId();
-                })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
-                mChargePicker.setPicker(mChargeList);
-            }
-            mChargePicker.show();
-        } else {
-            getDicListByType(PathConfig.DIC_CHARGE, 1);
-        }
-    }
-
-    /**
-     * 字典
-     */
-    private void getDicListByType(String pId, int i) {
-        ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
-        dialog.show();
         RetrofitManager.getInstance()
                 .create(LocationApiService.class)
-                .getDictListAllByPid(pId, UserLgUtils.getToken())
+                .getBaseRegisterDetail(mIdCard, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<List<DicBean>>() {
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Observer<BaseRegisterDetailBean>() {
                     @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+                    public void onSubscribe(Disposable d) {
 
                     }
 
                     @Override
-                    public void onNext(@NonNull List<DicBean> typeListBeans) {
+                    public void onNext(BaseRegisterDetailBean baseRegisterDetailBean) {
-                        dialog.dismiss();
+                        //设置基础信息
-                        if (typeListBeans.size() > 0) {
+                        setBaseInfo(baseRegisterDetailBean);
-                            switch (i) {
+                        refreshView(STATE_LOAD_SUCCESS);
-                                case 1://原罪名
-                                    mChargeList = typeListBeans;
-                                    onShowCharge();
-                                    break;
-                                case 2://安置
-                                    mPutCaseList = typeListBeans;
-                                    onShowPutCase();
-                                    break;
-                                case 3://衔接
-                                    mJoinCaseList = typeListBeans;
-                                    onShowJoinCase();
-                                    break;
-                                case 4://评估
-                                    mAssessList = typeListBeans;
-                                    onShowAssess();
-                                    break;
-                            }
-                        } else {
-                            ToastUtils.showShort("暂无数据");
-                        }
                     }
 
                     @Override
-                    public void onError(@NonNull Throwable e) {
+                    public void onError(Throwable e) {
-                        dialog.dismiss();
+                        refreshView(STATE_LOAD_ERROR);
                         ExceptionHandler.handleException(e);
                     }
 
@@ -362,36 +199,44 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
                 });
     }
 
+    /**
+     * 监管类别
+     */
+    private void onShowCorrectType() {
+        hideSoftKeyboard();
+        mCorrectTypePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
+            DicBean dicBean = mCorrectTypeList.get(o1);
+            mTvCorrectType.setText(dicBean.getDictionaryName());
+        })
+                .setTitleText("请选择")
+                .setCancelColor(Color.parseColor("#1189FF"))
+                .setSubmitColor(Color.parseColor("#1189FF"))
+                .setTitleColor(Color.parseColor("#1189FF"))
+                .build();
+        mCorrectTypePicker.setPicker(mCorrectTypeList);
+        mCorrectTypePicker.show();
+    }
+
 
     /**
-     * 获取本地字典
+     * 日期
+     * 1 释放日期  2衔接日期  3释放日期
      */
-//    private void getDicListLoc(String fileName, int type) {
+    private void onShowDate(TextView tvItem) {
-//        List<DicBean> tempList = ReadAssets.getAssetsDic(fileName, mActivity);
+        hideSoftKeyboard();
-//        if (tempList != null && tempList.size() > 0) {
+        TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> {
-//            switch (type) {
+            tvItem.setText(mDateFormat.format(date));
-//                case 1://原罪名
+        })
-//                    mChargeList = tempList;
+                .setTitleText("请选日期")
-//                    onShowCharge();
+                .setCancelColor(Color.parseColor("#1189FF"))
-//                    break;
+                .setSubmitColor(Color.parseColor("#1189FF"))
-//                case 2://安置
+                .setType(new boolean[]{true, true, true, false, false, false})
-//                    mPutCaseList = tempList;
+                .setTitleColor(Color.parseColor("#1189FF"))
-//                    onShowPutCase();
+                .build();
-//                    break;
+        mTimePickerView.show();
-//                case 3://衔接
+    }
-//                    mJoinCaseList = tempList;
+
-//                    onShowJoinCase();
+
-//                    break;
-//                case 4://评估
-//                    mAssessList = tempList;
-//                    onShowAssess();
-//                    break;
-//
-//            }
-//        } else {
-//            ToastUtils.showShort("暂无数据");
-//        }
-//    }
     private void doSubmit() {
         if (checkParams()) {
             if (!TextUtils.isEmpty(mId)) {
@@ -479,41 +324,23 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
                 });
     }
 
+
     private RequestBody buildParams() {
-        SaveCrimeBean bean = new SaveCrimeBean();
+        SaveCorrectBean bean = new SaveCorrectBean();
-        bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber());
+        bean.setPopulationInfoId(mBaseInfoBean.getPopulationInfoId());
-        bean.setIsCumulativeCrime(mIsCrime ? "1" : "0");
+        String crimeName = mEtCrimeName.getText().toString().trim();
-        String charge = mTvCharge.getText().toString().trim();//请选择原罪名
+        bean.setCharge(crimeName);
-        String priseTerm = mEtPrisonTerm.getText().toString().trim();//请输入原判刑期
+        String prisonTerm = mEtPrisonTerm.getText().toString().trim();
-        String prisePlace = mEtPrisonPlace.getText().toString().trim();//请输入服刑场所
+        bean.setPrisonTerm(prisonTerm);
-        String releaseDate = mTvReleaseDate.getText().toString().trim();//请选择释放日期
+        String correctType = mTvCorrectType.getText().toString().trim();
-        String assess = mTvAssess.getText().toString().trim();//请选择危险评估类型
+        bean.setType(correctType);
-        String joinDate = mTvJoinDate.getText().toString().trim();//请选择衔接日期
+        String manageDept = mEtManageDept.getText().toString().trim();
-        String joinCase = mTvJoinCase.getText().toString().trim();//请选择衔接情况
+        bean.setOrganization(manageDept);
-        String putDate = mTvPutDate.getText().toString().trim();//请选择安置日期
+        String manageDate = mTvManageDate.getText().toString().trim();
-        String putCase = mTvPutCase.getText().toString().trim();//请选择安置情况
+        bean.setSuperviseTime(manageDate);
-        bean.setIsCrimeAgain(mIsReCrime ? "1" : "0");
+        bean.setIsRelease(mSwIsSoldier.isChecked() ? "是" : "否");
-        bean.setNameOfOriginalSin(mSelcharge);
+        String releaseDate = mTvReleaseDate.getText().toString().trim();
-        bean.setOriginalSentenceData(priseTerm);
+        bean.setReleaseTime(releaseDate);
-        bean.setServingSentencePlace(prisePlace);
-        bean.setReleaseDate(releaseDate);
-        bean.setAssessmentRiskType(mSelAssess);
-        bean.setLinkUpDate(joinDate);
-        bean.setLinkUpSituation(mSelJoinCase);
-        bean.setPlacementDate(putDate);
-        bean.setPlacementSituation(mPutCase);
-        String unputCase = mEtUnputCase.getText().toString().trim();//未安置原因
-        if (!TextUtils.isEmpty(unputCase)) {
-            bean.setUnPlacementReason(unputCase);
-        }
-        String helpCase = mTvHelpCase.getText().toString().trim();//帮教情况
-        if (!TextUtils.isEmpty(helpCase)) {
-            bean.setHelpAndEducate(helpCase);
-        }
-        String crimeName = mEtCirmeName.getText().toString().trim();//重新犯罪罪名
-        if (!TextUtils.isEmpty(crimeName)) {
-            bean.setCrimeAgainCharge(crimeName);
-        }
         Gson gson = new Gson();
         String obj = gson.toJson(bean);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
@@ -524,45 +351,19 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
      * 校验参数
      */
     private boolean checkParams() {
-        if (TextUtils.isEmpty(mSelcharge)) {
+        String crimeName = mEtCrimeName.getText().toString().trim();
-            ToastUtils.showShort("请选择原罪名");
+        if (TextUtils.isEmpty(crimeName)) {
+            ToastUtils.showShort("请输入罪名");
             return false;
         }
-        String priseTerm = mEtPrisonTerm.getText().toString().trim();
+        String prisonTerm = mEtPrisonTerm.getText().toString().trim();
-        if (TextUtils.isEmpty(priseTerm)) {
+        if (TextUtils.isEmpty(prisonTerm)) {
-            ToastUtils.showShort("请输入原判刑期");
+            ToastUtils.showShort("请输入刑期");
             return false;
         }
-        String prisePlace = mEtPrisonPlace.getText().toString().trim();
+        String correctType = mTvCorrectType.getText().toString().trim();
-        if (TextUtils.isEmpty(prisePlace)) {
+        if (TextUtils.isEmpty(correctType)) {
-            ToastUtils.showShort("请输入服刑场所");
+            ToastUtils.showShort("请选择监管类别");
-            return false;
-        }
-        String releaseDate = mTvReleaseDate.getText().toString().trim();
-        if (TextUtils.isEmpty(releaseDate)) {
-            ToastUtils.showShort("请选择释放日期");
-            return false;
-        }
-        if (TextUtils.isEmpty(mSelAssess)) {
-            ToastUtils.showShort("请选择危险评估类型");
-            return false;
-        }
-        String joinDate = mTvJoinDate.getText().toString().trim();
-        if (TextUtils.isEmpty(joinDate)) {
-            ToastUtils.showShort("请选择衔接日期");
-            return false;
-        }
-        if (TextUtils.isEmpty(mSelJoinCase)) {
-            ToastUtils.showShort("请选择衔接情况");
-            return false;
-        }
-        String putDate = mTvPutDate.getText().toString().trim();
-        if (TextUtils.isEmpty(putDate)) {
-            ToastUtils.showShort("请选择安置日期");
-            return false;
-        }
-        if (TextUtils.isEmpty(mPutCase)) {
-            ToastUtils.showShort("请选择安置情况");
             return false;
         }
 
@@ -578,14 +379,14 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
                 .getCrimeDetailById(id, UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<CensusCrimeDetailBean>() {
+                .subscribe(new Observer<CorrectDetailBean>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
 
                     }
 
                     @Override
-                    public void onNext(@NonNull CensusCrimeDetailBean censusCrimeDetailBean) {
+                    public void onNext(@NonNull CorrectDetailBean censusCrimeDetailBean) {
                         setDataToView(censusCrimeDetailBean, 0);
                     }
 
@@ -609,114 +410,44 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
         String searchIdCard = mEtSearchIdCard.getText().toString().trim();
         if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) {
             ToastUtils.showShort("请输入合法的身份证号码");
-            return;
         } else {
             hideSoftKeyboard();
             ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中...");
             dialog.show();
-            Observable<CensusCrimeDetailBean> detailBeanObservable = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailByIdCard(searchIdCard, UserLgUtils.getToken());
-            Observable<SearchBaseInfoBean> infoBean = RetrofitManager.getInstance()
-                    .create(LocationApiService.class)
-                    .doSearchBaseInfoByIdCard(searchIdCard, UserLgUtils.getToken());
-            Observable.merge(detailBeanObservable, infoBean)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<Object>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
 
-                        }
 
-                        @Override
-                        public void onNext(@NonNull Object o) {
-                            if (o instanceof SearchBaseInfoBean) {
-                                SearchBaseInfoBean infoBean1 = (SearchBaseInfoBean) o;
-                                if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) {
-                                    //设置基础信息
-                                    setBaseInfo(infoBean1);
-                                } else {
-                                    ToastUtils.showLong("未查询到改人员的基础信息,请完善基础信息");
-                                    mTvBaseName.setText("");
-                                    mTvBaseGender.setText("");
-                                    mTvBasePhone.setText("");
-                                    mTvBaseNative.setText("");
-                                    mTvBaseCurLoc.setText("");
-                                    mLlContent.setVisibility(View.GONE);
-                                }
-                            } else if (o instanceof CensusCrimeDetailBean) {
-                                CensusCrimeDetailBean bean = (CensusCrimeDetailBean) o;
-                                if (!TextUtils.isEmpty(bean.getReleaseAfterSentenceId())) {
-                                    mTvBaseTitle.setText("刑满释放人员信息编辑");
-                                } else {
-                                    mTvBaseTitle.setText("刑满释放人员信息录入");
-                                }
-                                setDataToView(bean, 1);
-                            }
-                            dialog.dismiss();
-                        }
-
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
-
-                        @Override
-                        public void onComplete() {
-
-                        }
-                    });
         }
     }
 
     /**
      * 回填数据
      */
-    private void setDataToView(CensusCrimeDetailBean bean, int type) {
+    private void setDataToView(CorrectDetailBean bean, int type) {
-        mId = bean.getReleaseAfterSentenceId();
+        mId = bean.getReleaseId();
-        mIsCrime = bean.getIsCumulativeCrime().equals("1");
+        mEtCrimeName.setText(bean.getCharge());
-        mSwCrime.setChecked(mIsCrime);//是否累犯
+        mEtPrisonTerm.setText(bean.getPrisonTerm());
-        mTvCharge.setText(bean.getNameOfOriginalSinDictionaryName());//原罪名
+        mTvCorrectType.setText(bean.getType());
-        mSelcharge = bean.getNameOfOriginalSin();
+        mEtManageDept.setText(bean.getOrganization());
-        mEtPrisonTerm.setText(bean.getOriginalSentenceData());//原判刑期
+        mTvManageDate.setText(bean.getSuperviseTime());
-        mEtPrisonPlace.setText(bean.getServingSentencePlace());//服刑场所
+        mSwIsSoldier.setChecked("是".equals(bean.getIsRelease()));
-        mTvReleaseDate.setText(bean.getReleaseDate());//释放日期
+        mTvReleaseDate.setText(bean.getReleaseTime());
-        mTvAssess.setText(bean.getAssessmentRiskTypeDictionaryName());//危险评估
-        mSelAssess = bean.getAssessmentRiskType();
-        mTvJoinDate.setText(bean.getLinkUpDate());//衔接日期
-        mTvJoinCase.setText(bean.getLinkUpSituationDictionaryName());//衔接情况
-        mSelJoinCase = bean.getLinkUpSituation();
-        mTvPutDate.setText(bean.getPlacementDate());//安置日期
-        mTvPutCase.setText(bean.getPlacementSituationDictionaryName());//安置情况
-        mPutCase = bean.getPlacementSituation();
-        mEtUnputCase.setText(bean.getUnPlacementReason());//未安置原因
-        mTvHelpCase.setText(bean.getHelpAndEducate());//帮扶情况
-
-        mIsReCrime = bean.getIsCrimeAgain().equals("1");
-        mSwIsRecirme.setChecked(mIsReCrime);//是否重新犯罪
-        mEtCirmeName.setText(bean.getCrimeAgainCharge());//重新犯罪罪名
-        if (type == 0) {
-            mEtSearchIdCard.setText(bean.getIdCardNumber());
-            doSearchPerson();
-        }
         refreshView(STATE_LOAD_SUCCESS);
     }
 
     /**
      * 设置基础信息
      */
-    private void setBaseInfo(SearchBaseInfoBean o) {
+    private void setBaseInfo(BaseRegisterDetailBean o) {
         mBaseInfoBean = o;
         mLlContent.setVisibility(View.VISIBLE);
-        mTvBaseName.setText(o.getFullName());
+        mTvBaseName.setText(o.getName());
-        mTvBaseGender.setText(o.getGenderDictionaryName());
+        mTvBaseGender.setText(o.getSex());
-        mTvBasePhone.setText(o.getTelephone());
+        mTvBasePhone.setText(o.getPhone());
-        mTvBaseNative.setText(o.getNativePlaceAddr());
+        mTvBaseNative.setText(o.getOriginAddress());
-        mTvBaseCurLoc.setText(o.getAreaNames() + "/" + o.getCurrentResidenceAddr());
+        mTvBaseCurLoc.setText(o.getDomicileAreaName() + "/" + o.getDomicileAddress());
 
     }
 
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -725,4 +456,5 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
         }
     }
 
+
 }

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalListActivity.java

@@ -18,11 +18,9 @@ import com.sucstepsoft.cm_utils.utils.ToastUtils;
 import com.sucstepsoft.cm_utils.utils.UIUtil;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
-import com.sucstepsoft.realtimelocation.activitys.census.normal.CensusRegisterAddActivity;
+import com.sucstepsoft.realtimelocation.adapters.CorrectPersonAdapter;
-import com.sucstepsoft.realtimelocation.activitys.census.normal.CensusRegisterDetailActivity;
-import com.sucstepsoft.realtimelocation.adapters.CensusPersonAdapter;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
-import com.sucstepsoft.realtimelocation.beans.person.CensusPersonBean;
+import com.sucstepsoft.realtimelocation.beans.person.PersonCorrectBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
 
@@ -50,13 +48,18 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
     Button mBtnSearch;
     @BindView(R.id.xlv_content)
     XRecyclerView mXlvItems;
+
+
     private Unbinder mBind;
     private String mRows = "20";
     private int mCurPage = 1;
-    private CensusPersonAdapter mAdapter;
+    private CorrectPersonAdapter mAdapter;
-    private List<CensusPersonBean.RowsBean> mDatas = new ArrayList<>();
+    private List<PersonCorrectBean.RowsBean> mDatas = new ArrayList<>();
     private Disposable mDisposable;
+
+
     private String mKeywords = "";
+    private String mId;
 
     @Override
     protected int setLayoutId() {
@@ -66,22 +69,19 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("刑满释放人员");
+        mTvBaseTitle.setText("刑满释放信息");
         mTvPublish.setVisibility(View.VISIBLE);
         mTvPublish.setText("新增");
+        mId = getIntent().getStringExtra("idCard");
         mTvPublish.setOnClickListener(v -> {
             Intent intent = new Intent(mActivity, CensusSpecialCriminalAddActivity.class);
-            intent.putExtra("title", "刑满释放人员信息录入");
+            intent.putExtra("title", "刑满释放信息录入");
+            intent.putExtra("idCard", mId);
             startActivity(intent);
         });
 
-        mBtnSearch.setOnClickListener(v -> doSearch());
+
-        mIvClear.setOnClickListener(v -> {
+        mAdapter = new CorrectPersonAdapter(mActivity, mDatas);
-            mKeywords = "";
-            mEtSearchContent.setText("");
-            refreshData();
-        });
-        mAdapter = new CensusPersonAdapter(mActivity, mDatas);
         LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
         layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         mXlvItems.setLayoutManager(layoutManager);
@@ -102,39 +102,41 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
                 getUpcomingList(mCurPage);
             }
         });
-        mAdapter.addOnEditListener(new CensusPersonAdapter.OnEditListener() {
+        mAdapter.addOnEditListener(new CorrectPersonAdapter.OnEditListener() {
             @Override
-            public void onDel(CensusPersonBean.RowsBean bean, int pos) {
+            public void onDel(PersonCorrectBean.RowsBean bean, int pos) {
                 doDelBean(bean, pos);
             }
 
             @Override
-            public void onEdit(CensusPersonBean.RowsBean bean, int pos) {
+            public void onEdit(PersonCorrectBean.RowsBean bean, int pos) {
                 doEditBean(bean, pos);
             }
         });
     }
+
     /**
      * 搜索
      */
     private void doSearch() {
-        String searchContent = mEtSearchContent.getText().toString().trim();
+//        String searchContent = mEtSearchContent.getText().toString().trim();
-        if (!TextUtils.isEmpty(searchContent)) {
+//        if (!TextUtils.isEmpty(searchContent)) {
-            hideSoftKeyboard();
+//            hideSoftKeyboard();
-            mKeywords = searchContent;
+//            mKeywords = searchContent;
-            mCurPage = 1;
+//            mCurPage = 1;
-            getUpcomingList(mCurPage);
+//            getUpcomingList(mCurPage);
-        } else {
+//        } else {
-            ToastUtils.showShort("请输入要查询的内容");
+//            ToastUtils.showShort("请输入要查询的内容");
-        }
+//        }
     }
+
     /**
      * 删除数据
      *
      * @param bean
      * @param pos
      */
-    private void doDelBean(CensusPersonBean.RowsBean bean, int pos) {
+    private void doDelBean(PersonCorrectBean.RowsBean bean, int pos) {
         AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
         builder.setTitle("提示")
                 .setMessage("确定要删除该条信息吗?")
@@ -144,7 +146,7 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
                     dialog1.show();
                     RetrofitManager.getInstance()
                             .create(LocationApiService.class)
-                            .doDelCrime(bean.getReleaseAfterSentenceId(), UserLgUtils.getToken())
+                            .doDelCrime(bean.getReleaseId(), UserLgUtils.getToken())
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(new Observer<SuccessBean>() {
@@ -184,10 +186,11 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
      * @param bean
      * @param pos
      */
-    private void doEditBean(CensusPersonBean.RowsBean bean, int pos) {
+    private void doEditBean(PersonCorrectBean.RowsBean bean, int pos) {
         Intent intent = new Intent(mActivity, CensusSpecialCriminalAddActivity.class);
-        intent.putExtra("title", "刑满释放人员信息编辑");
+        intent.putExtra("title", "刑满释放信息编辑");
-        intent.putExtra("id", bean.getReleaseAfterSentenceId());
+        intent.putExtra("id", bean.getReleaseId());
+        intent.putExtra("idCard", bean.getPopulationInfoId());
         startActivity(intent);
     }
 
@@ -196,10 +199,10 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
      *
      * @param bean
      */
-    private void showDetail(CensusPersonBean.RowsBean bean) {
+    private void showDetail(PersonCorrectBean.RowsBean bean) {
         Intent intent = new Intent(mActivity, CensusSpecialCrimianlDetailActivity.class);
-        intent.putExtra("id", bean.getReleaseAfterSentenceId());
+        intent.putExtra("id", bean.getReleaseId());
-        intent.putExtra("idCard", bean.getIdCardNumber());
+        intent.putExtra("idCard", bean.getPopulationInfoId());
         startActivity(intent);
     }
 
@@ -220,17 +223,17 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
         mCurPage = page;
         RetrofitManager.getInstance()
                 .create(LocationApiService.class)
-                .getCrimeList(page + "",mKeywords, UserLgUtils.getToken())
+                .getCrimeList(mId, page + "", mKeywords, UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<CensusPersonBean>() {
+                .subscribe(new Observer<PersonCorrectBean>() {
                     @Override
                     public void onSubscribe(Disposable d) {
 
                     }
 
                     @Override
-                    public void onNext(CensusPersonBean leaveListBean) {
+                    public void onNext(PersonCorrectBean leaveListBean) {
                         if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) {
                             ++mCurPage;
                             if (page == 1) {

app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/CorrectDetailBean.java

@@ -22,6 +22,16 @@ public class CorrectDetailBean {
     private String releaseTime;
     private String superviseTime;
     private String type;
+    private String releaseId;
+
+
+    public String getReleaseId() {
+        return releaseId;
+    }
+
+    public void setReleaseId(String releaseId) {
+        this.releaseId = releaseId;
+    }
 
     public String getCharge() {
         return charge;

app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/PersonCorrectBean.java

@@ -40,7 +40,8 @@ public class PersonCorrectBean {
 
     public static class RowsBean {
         private String charge;
-        private String correctId;
+        private String correctId;//社区矫正
+        private String releaseId;//刑满释放
         private String creator;
         private String gmtCreate;
         private String gmtModified;
@@ -54,6 +55,14 @@ public class PersonCorrectBean {
         private String superviseTime;
         private String type;
 
+        public String getReleaseId() {
+            return releaseId;
+        }
+
+        public void setReleaseId(String releaseId) {
+            this.releaseId = releaseId;
+        }
+
         public String getCharge() {
             return charge;
         }

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

@@ -1068,29 +1068,29 @@ public interface LocationApiService {
      * 保存刑满释放人员
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @POST("app/releaseaftersentence/savereleaseaftersentence")
+    @POST("app/release/save")
     Observable<SuccessBean> doSaveCrime(@Body RequestBody body, @Header("token") String token);
 
     /**
      * 编辑刑满释放人员
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @PUT("app/releaseaftersentence/updatereleaseaftersentence/{releaseAfterSentenceId}")
+    @PUT("app/release/updaterelease/{releaseId}")
-    Observable<SuccessBean> doEditCrime(@Path("releaseAfterSentenceId") String id, @Body RequestBody body, @Header("token") String token);
+    Observable<SuccessBean> doEditCrime(@Path("releaseId") String id, @Body RequestBody body, @Header("token") String token);
 
     /**
-     * 删除出租房
+     * 删除刑满释放
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @DELETE("app/releaseaftersentence/removereleaseaftersentence/{ids}")
+    @DELETE("app/release/remove/{ids}")
     Observable<SuccessBean> doDelCrime(@Path("ids") String id, @Header("token") String token);
 
     /**
-     * 根据ID获取详情
+     * 刑满释放详情
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @GET("app/releaseaftersentence/getreleaseaftersentencebyid/{releaseAfterSentenceId}")
+    @GET("app/release/get/{releaseId}")
-    Observable<CensusCrimeDetailBean> getCrimeDetailById(@Path("releaseAfterSentenceId") String id, @Header("token") String token);
+    Observable<CorrectDetailBean> getCrimeDetailById(@Path("releaseId") String id, @Header("token") String token);
 
     /**
      * 根据身份证号码获取详情
@@ -1103,8 +1103,8 @@ public interface LocationApiService {
      * 刑满释放人员列表
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @GET("app/releaseaftersentence/listpagereleaseaftersentence")
+    @GET("app/release/listpagerelease")
-    Observable<CensusPersonBean> getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
+    Observable<PersonCorrectBean> getCrimeList(@Query("populationInfoId")String id,@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
 
 
     /*===========================================社区矫正===========================================*/

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

@@ -1,25 +1,28 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activitys.census.normal.CensusRegisterDetailActivity">
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include layout="@layout/layout_base_info_detail" />
+        <include
+            layout="@layout/layout_search"
+            android:visibility="gone" />
 
-        <android.support.v7.widget.CardView
+        <include layout="@layout/layout_base_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:orientation="vertical">
-            app:cardCornerRadius="5dp"
+
-            app:cardPreventCornerOverlap="true"
-            app:cardUseCompatPadding="false">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -27,225 +30,127 @@
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/tv_issue_base_info"
                     style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
                     android:padding="8dp"
-                    android:text="刑满释放人员信息"
+                    android:text="基础信息"
                     android:textStyle="bold" />
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
 
-                    <TextView
+                    <LinearLayout style="@style/item_white_bottom_border">
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="是否累犯" />
 
-                    <View style="@style/vertical_line" />
 
-                    <Switch
+                        <TextView
-                        android:id="@+id/sw_crime"
+                            style="@style/item_title_wrap"
-                        style="@style/item_switch"
+                            android:text="罪名" />
-                        android:enabled="false" />
+
+
+                        <TextView
+                            android:id="@+id/tv_crime_name"
+                            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_prison_term"
+                            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_correct_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/et_manage_dept"
+                            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_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="是否释放" />
+
+
+                        <Switch
+                            android:id="@+id/sw_is_soldier"
+                            style="@style/item_switch"
+                            android:enabled="false" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="释放时间" />
+
+
+                        <TextView
+                            android:id="@+id/tv_release_date"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="原  罪  名" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_charge"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="原判刑期" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/et_prison_term"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="服刑场所" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/et_prison_place"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="释放日期" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_release_date"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="危险评估" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_assess"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="衔接日期" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_join_date"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="衔接情况" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_join_case"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="安置日期" />
-
-                    <View style="@style/vertical_line" />
-
-
-                    <TextView
-                        android:id="@+id/tv_put_date"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="安置情况" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/tv_put_case"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="未安置原因" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/et_unput_case"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:text="帮教情况" />
-
-                    <View style="@style/vertical_line" />
-
-
-                    <TextView
-                        android:id="@+id/tv_help_case"
-                        style="@style/sel_text_show" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="是否重新犯罪"
-                        android:textSize="12sp" />
-
-                    <View style="@style/vertical_line" />
-
-                    <Switch
-                        android:id="@+id/sw_is_recirme"
-                        style="@style/item_switch"
-                        android:layout_gravity="center_vertical"
-                        android:enabled="false" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="重新犯罪罪名"
-                        android:textSize="12sp" />
-
-                    <View style="@style/vertical_line" />
-
-
-                    <TextView
-                        android:id="@+id/et_cirme_name"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </LinearLayout>
 
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

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

@@ -1,20 +1,17 @@
 <?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"
-    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"
+    android:scrollbars="none">
-    tools:context=".activitys.census.CensusEnterActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include layout="@layout/layout_search" />
+        <include layout="@layout/layout_search" android:visibility="gone" />
 
         <include layout="@layout/layout_base_info" />
 
@@ -25,292 +22,160 @@
             android:orientation="vertical">
 
 
-            <android.support.v7.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:orientation="vertical">
-                app:cardCornerRadius="5dp"
+
-                app:cardPreventCornerOverlap="true"
+                <TextView
-                app:cardUseCompatPadding="false">
+                    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">
-                        android:id="@+id/tv_issue_base_info"
-                        style="@style/issue_report_title"
-                        android:padding="8dp"
-                        android:text="刑满释放人员信息"
-                        android:textStyle="bold" />
 
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
 
                         <TextView
-                            style="@style/item_title"
+                            style="@style/item_title_wrap"
-                            android:layout_gravity="center_vertical"
+                            android:text="罪名" />
-                            android:text="是否累犯" />
-
-                        <View style="@style/vertical_line" />
-
-                        <Switch
-                            android:id="@+id/sw_crime"
-                            style="@style/item_switch" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="原  罪  名" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_charge"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择原罪名" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="原判刑期" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_prison_term"
-                            style="@style/item_content"
-                            android:hint="请输入原判刑期"
-                            android:inputType="text" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="服刑场所" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_prison_place"
-                            style="@style/item_content"
-                            android:hint="请输入服刑场所"
-                            android:inputType="text" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
 
                         <ImageView
                             style="@style/style_hint_star"
-                            android:visibility="visible" />
+                            android:layout_gravity="center_vertical" />
+
+                        <EditText
+                            android:id="@+id/et_crime_name"
+                            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"
+                            style="@style/item_title_wrap"
-                            android:text="释放日期" />
+                            android:layout_gravity="center_vertical"
+                            android:text="刑期" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical" />
+
+                        <EditText
+                            android:id="@+id/et_prison_term"
+                            style="@style/item_content_match"
+                            android:hint="请输入刑期(例如:3年6个月)" />
+
+                    </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_correct_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_dept"
+                            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_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="是否释放" />
+
+
+                        <Switch
+                            android:id="@+id/sw_is_soldier"
+                            android:checked="true"
+                            style="@style/item_switch" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="释放时间" />
 
-                        <View style="@style/vertical_line" />
 
                         <TextView
                             android:id="@+id/tv_release_date"
                             style="@style/sel_text_arrow"
-                            android:hint="请选择释放日期" />
+                            android:hint="请选择释放时间" />
                     </LinearLayout>
 
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="visible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="危险评估" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_assess"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择危险性评估类型" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="visible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="衔接日期" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_join_date"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择衔接日期" />
-                    </LinearLayout>
-
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="衔接情况" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_join_case"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择衔接情况" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="安置日期" />
-
-                        <View style="@style/vertical_line" />
-
-
-                        <TextView
-                            android:id="@+id/tv_put_date"
-                            style="@style/sel_text_arrow"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请选择安置日期" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="安置情况" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_put_case"
-                            style="@style/sel_text_arrow"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请选择安置情况" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="未安置原因" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_unput_case"
-                            style="@style/item_content"
-                            android:hint="请输入未安置原因"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="帮教情况" />
-
-                        <View style="@style/vertical_line" />
-
-
-                        <EditText
-                            android:id="@+id/tv_help_case"
-                            style="@style/item_content"
-                            android:hint="请输入帮教情况"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="是否重新犯罪"
-                            android:textSize="12sp" />
-
-                        <View style="@style/vertical_line" />
-
-                        <Switch
-                            android:id="@+id/sw_is_recirme"
-                            style="@style/item_switch"
-                            android:layout_gravity="center_vertical" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" android:visibility="invisible"/>
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="重新犯罪罪名"
-                            android:textSize="12sp" />
-
-                        <View style="@style/vertical_line" />
-
-
-                        <EditText
-                            android:id="@+id/et_cirme_name"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入重新犯罪罪名"
-                            android:inputType="textMultiLine" />
-                    </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>
-            </android.support.v7.widget.CardView>
+
+                <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>
 
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
+</android.support.v4.widget.NestedScrollView>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/item_search" />
+    <include layout="@layout/item_search" android:visibility="gone" />
 
     <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:id="@+id/xlv_content"