From d413604a7852a84bfa16af401cd6868286cc48b5 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Wed, 1 Nov 2023 15:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=91=E6=BB=A1=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../normal/CensusRegisterDetailActivity.java | 7 +- .../special/CensusCorrctListActivity.java | 4 +- .../special/CensusCorrectAddActivity.java | 2 +- .../CensusSpecialCrimianlDetailActivity.java | 200 +++---- .../CensusSpecialCriminalAddActivity.java | 558 +++++------------- .../CensusSpecialCriminalListActivity.java | 79 +-- .../beans/person/CorrectDetailBean.java | 10 + .../beans/person/PersonCorrectBean.java | 11 +- .../net/LocationApiService.java | 20 +- ...ctivity_census_special_crimianl_detail.xml | 341 ++++------- .../activity_census_special_criminal_add.xml | 401 +++++-------- .../activity_census_special_criminal_list.xml | 2 +- 12 files changed, 575 insertions(+), 1060 deletions(-) diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/normal/CensusRegisterDetailActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/normal/CensusRegisterDetailActivity.java index 3085173..5720704 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/normal/CensusRegisterDetailActivity.java +++ b/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; diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrctListActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrctListActivity.java index aada920..5a41232 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrctListActivity.java +++ b/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 = ""; diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrectAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrectAddActivity.java index 07eb25d..178233f 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusCorrectAddActivity.java +++ b/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()); diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCrimianlDetailActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCrimianlDetailActivity.java index 09e3ef6..9332aed 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCrimianlDetailActivity.java +++ b/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() { - return R.layout.activity_census_special_crimianl_detail; - } + + @BindView(R.id.et_search_id_card) + 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 baseInfo = RetrofitManager.getInstance().create(LocationApiService.class).doSearchBaseInfoByIdCard(idCard, UserLgUtils.getToken()); - Observable registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailById(id, UserLgUtils.getToken()); - Observable.merge(baseInfo, registerInfo) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + Observable baseRegisterDetail = RetrofitManager.getInstance().create(LocationApiService.class).getBaseRegisterDetail(idCard, UserLgUtils.getToken()); + Observable registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailById(id, UserLgUtils.getToken()); + Observable.merge(baseRegisterDetail, registerInfo) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + 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 - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onNext(@NonNull Object o) { + if (o instanceof BaseRegisterDetailBean) { + mBaseInfo = (BaseRegisterDetailBean) o; + setBaseInfo(); + } else if (o instanceof CorrectDetailBean) { + mDetailBean = (CorrectDetailBean) o; + setDataToView(); + } + refreshView(STATE_LOAD_SUCCESS); + } - @Override - public void onComplete() { + @Override + 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()); - mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore()); - mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName()); - mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证 - mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话 - mTvBaseNative.setText(mBaseInfo.getNativePlaceAddr());//籍贯 - mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族 - mTvBaseCurLoc.setText(mBaseInfo.getAreaNames());//现住址 - mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情 + mTvBaseName.setText(mBaseInfo.getName()); + mTvBaseGender.setText(mBaseInfo.getSex()); + mTvBasePhone.setText(mBaseInfo.getPhone()); + mTvBaseNative.setText(mBaseInfo.getOriginAddress()); + mTvBaseCurLoc.setText(mBaseInfo.getDomicileAreaName() + "/" + mBaseInfo.getDomicileAddress()); } /** * 详细信息 */ private void setDataToView() { - mSwCrime.setChecked(mDetailBean.getIsCumulativeCrime().equals("1"));//是否累犯 - mTvCharge.setText(mDetailBean.getNameOfOriginalSinDictionaryName());//原罪名 - mEtPrisonTerm.setText(mDetailBean.getOriginalSentenceData());//原判刑期 - mEtPrisonPlace.setText(mDetailBean.getServingSentencePlace());//服刑场所 - mTvReleaseDate.setText(mDetailBean.getReleaseDate());//释放日期 - mTvAssess.setText(mDetailBean.getAssessmentRiskTypeDictionaryName());//危险评估 - mTvJoinDate.setText(mDetailBean.getLinkUpDate());//衔接日期 - mTvJoinCase.setText(mDetailBean.getLinkUpSituationDictionaryName());//衔接情况 - mTvPutDate.setText(mDetailBean.getPlacementDate());//安置日期 - mTvPutCase.setText(mDetailBean.getPlacementSituationDictionaryName());//安置情况 - mEtUnputCase.setText(mDetailBean.getUnPlacementReason());//未安置原因 - mTvHelpCase.setText(mDetailBean.getHelpAndEducate());//帮扶情况 - mSwIsRecirme.setChecked(mDetailBean.getIsCrimeAgain().equals("1"));//是否重新犯罪 - mEtCirmeName.setText(mDetailBean.getCrimeAgainCharge());//重新犯罪罪名 + mTvCrimeName.setText(mDetailBean.getCharge()); + mTvPrisonTerm.setText(mDetailBean.getPrisonTerm()); + mTvCorrectType.setText(mDetailBean.getType()); + mEtManageDept.setText(mDetailBean.getOrganization()); + mTvManageDate.setText(mDetailBean.getSuperviseTime()); + mSwIsSoldier.setChecked("是".equals(mDetailBean.getIsRelease())); + mTvReleaseDate.setText(mDetailBean.getReleaseTime()); + } + + @Override + protected int setLayoutId() { + return R.layout.activity_census_special_crimianl_detail; } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalAddActivity.java index e9f4f90..b39ed9d 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalAddActivity.java +++ b/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;//搜索框 - @BindView(R.id.btn_search) - Button mBtnSearch;//收搜按钮 + EditText mEtSearchIdCard; @BindView(R.id.iv_clear) ImageView mIvClear; - //基础信息 - @BindView(R.id.cv_base_info) - CardView mCvBaseInfo;//基础信息 + @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_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.sw_crime) - Switch mSwCrime;//是否累犯 - @BindView(R.id.tv_charge) - TextView mTvCharge;//原罪名 + @BindView(R.id.cv_base_info) + LinearLayout mCvBaseInfo; + @BindView(R.id.et_crime_name) + EditText mEtCrimeName; @BindView(R.id.et_prison_term) - EditText mEtPrisonTerm;//原判刑期 - @BindView(R.id.et_prison_place) - EditText mEtPrisonPlace;//服刑场所 + EditText mEtPrisonTerm; + @BindView(R.id.tv_correct_type) + 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;//释放日期 - @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;//重新犯罪罪名 + TextView mTvReleaseDate; @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 SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private List mChargeList; - private List mAssessList; - private List mJoinCaseList; - private List mPutCaseList; - private OptionsPickerView mChargePicker; - private OptionsPickerView mAssessPicker; - private OptionsPickerView mJoinCasePicker; - private OptionsPickerView mPutCasePicker; - private boolean mIsCrime;//是否累犯 - private boolean mIsReCrime;//是否重新犯罪 - private String mSelAssess; - private String mSelJoinCase; - private String mPutCase; - private String mSelcharge; + private BaseRegisterDetailBean mBaseInfoBean; + private boolean mIsRelease = false; + + private List mCorrectTypeList; + + + private OptionsPickerView mCorrectTypePicker; + private String mIdCard; @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); - refreshView(STATE_LOAD_SUCCESS); + mLlSearchContent.setVisibility(View.GONE); } 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()); - - 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)); - + getPersonDetail(); } /** - * 安置情况 + * 获取人员详情 */ - private void onShowPutCase() { - 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(); + private void getPersonDetail() { RetrofitManager.getInstance() .create(LocationApiService.class) - .getDictListAllByPid(pId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) + .getBaseRegisterDetail(mIdCard, UserLgUtils.getToken()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { + .subscribeOn(Schedulers.io()) + .subscribe(new Observer() { @Override - public void onSubscribe(@NonNull Disposable d) { + public void onSubscribe(Disposable d) { } @Override - public void onNext(@NonNull List typeListBeans) { - dialog.dismiss(); - if (typeListBeans.size() > 0) { - switch (i) { - 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("暂无数据"); - } + public void onNext(BaseRegisterDetailBean baseRegisterDetailBean) { + //设置基础信息 + setBaseInfo(baseRegisterDetailBean); + refreshView(STATE_LOAD_SUCCESS); } @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); + public void onError(Throwable e) { + 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) { -// List tempList = ReadAssets.getAssetsDic(fileName, mActivity); -// if (tempList != null && tempList.size() > 0) { -// switch (type) { -// case 1://原罪名 -// mChargeList = tempList; -// onShowCharge(); -// break; -// case 2://安置 -// mPutCaseList = tempList; -// onShowPutCase(); -// break; -// case 3://衔接 -// mJoinCaseList = tempList; -// onShowJoinCase(); -// break; -// case 4://评估 -// mAssessList = tempList; -// onShowAssess(); -// break; -// -// } -// } else { -// ToastUtils.showShort("暂无数据"); -// } -// } + private void onShowDate(TextView tvItem) { + hideSoftKeyboard(); + TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> { + tvItem.setText(mDateFormat.format(date)); + }) + .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 doSubmit() { if (checkParams()) { if (!TextUtils.isEmpty(mId)) { @@ -479,41 +324,23 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity { }); } + private RequestBody buildParams() { - SaveCrimeBean bean = new SaveCrimeBean(); - bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber()); - bean.setIsCumulativeCrime(mIsCrime ? "1" : "0"); - String charge = mTvCharge.getText().toString().trim();//请选择原罪名 - String priseTerm = mEtPrisonTerm.getText().toString().trim();//请输入原判刑期 - String prisePlace = mEtPrisonPlace.getText().toString().trim();//请输入服刑场所 - String releaseDate = mTvReleaseDate.getText().toString().trim();//请选择释放日期 - String assess = mTvAssess.getText().toString().trim();//请选择危险评估类型 - String joinDate = mTvJoinDate.getText().toString().trim();//请选择衔接日期 - String joinCase = mTvJoinCase.getText().toString().trim();//请选择衔接情况 - String putDate = mTvPutDate.getText().toString().trim();//请选择安置日期 - String putCase = mTvPutCase.getText().toString().trim();//请选择安置情况 - bean.setIsCrimeAgain(mIsReCrime ? "1" : "0"); - bean.setNameOfOriginalSin(mSelcharge); - bean.setOriginalSentenceData(priseTerm); - 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); - } + SaveCorrectBean bean = new SaveCorrectBean(); + bean.setPopulationInfoId(mBaseInfoBean.getPopulationInfoId()); + String crimeName = mEtCrimeName.getText().toString().trim(); + bean.setCharge(crimeName); + String prisonTerm = mEtPrisonTerm.getText().toString().trim(); + bean.setPrisonTerm(prisonTerm); + String correctType = mTvCorrectType.getText().toString().trim(); + bean.setType(correctType); + String manageDept = mEtManageDept.getText().toString().trim(); + bean.setOrganization(manageDept); + String manageDate = mTvManageDate.getText().toString().trim(); + bean.setSuperviseTime(manageDate); + bean.setIsRelease(mSwIsSoldier.isChecked() ? "是" : "否"); + String releaseDate = mTvReleaseDate.getText().toString().trim(); + bean.setReleaseTime(releaseDate); 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)) { - ToastUtils.showShort("请选择原罪名"); + String crimeName = mEtCrimeName.getText().toString().trim(); + if (TextUtils.isEmpty(crimeName)) { + ToastUtils.showShort("请输入罪名"); return false; } - String priseTerm = mEtPrisonTerm.getText().toString().trim(); - if (TextUtils.isEmpty(priseTerm)) { - ToastUtils.showShort("请输入原判刑期"); + String prisonTerm = mEtPrisonTerm.getText().toString().trim(); + if (TextUtils.isEmpty(prisonTerm)) { + ToastUtils.showShort("请输入刑期"); return false; } - String prisePlace = mEtPrisonPlace.getText().toString().trim(); - if (TextUtils.isEmpty(prisePlace)) { - 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("请选择安置情况"); + String correctType = mTvCorrectType.getText().toString().trim(); + if (TextUtils.isEmpty(correctType)) { + 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() { + .subscribe(new Observer() { @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 detailBeanObservable = RetrofitManager.getInstance().create(LocationApiService.class).getCrimeDetailByIdCard(searchIdCard, UserLgUtils.getToken()); - Observable infoBean = RetrofitManager.getInstance() - .create(LocationApiService.class) - .doSearchBaseInfoByIdCard(searchIdCard, UserLgUtils.getToken()); - Observable.merge(detailBeanObservable, infoBean) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @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) { - mId = bean.getReleaseAfterSentenceId(); - mIsCrime = bean.getIsCumulativeCrime().equals("1"); - mSwCrime.setChecked(mIsCrime);//是否累犯 - mTvCharge.setText(bean.getNameOfOriginalSinDictionaryName());//原罪名 - mSelcharge = bean.getNameOfOriginalSin(); - mEtPrisonTerm.setText(bean.getOriginalSentenceData());//原判刑期 - mEtPrisonPlace.setText(bean.getServingSentencePlace());//服刑场所 - mTvReleaseDate.setText(bean.getReleaseDate());//释放日期 - 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(); - } + private void setDataToView(CorrectDetailBean bean, int type) { + mId = bean.getReleaseId(); + mEtCrimeName.setText(bean.getCharge()); + mEtPrisonTerm.setText(bean.getPrisonTerm()); + mTvCorrectType.setText(bean.getType()); + mEtManageDept.setText(bean.getOrganization()); + mTvManageDate.setText(bean.getSuperviseTime()); + mSwIsSoldier.setChecked("是".equals(bean.getIsRelease())); + mTvReleaseDate.setText(bean.getReleaseTime()); refreshView(STATE_LOAD_SUCCESS); } /** * 设置基础信息 */ - private void setBaseInfo(SearchBaseInfoBean o) { + private void setBaseInfo(BaseRegisterDetailBean o) { mBaseInfoBean = o; mLlContent.setVisibility(View.VISIBLE); - mTvBaseName.setText(o.getFullName()); - mTvBaseGender.setText(o.getGenderDictionaryName()); - mTvBasePhone.setText(o.getTelephone()); - mTvBaseNative.setText(o.getNativePlaceAddr()); - mTvBaseCurLoc.setText(o.getAreaNames() + "/" + o.getCurrentResidenceAddr()); + mTvBaseName.setText(o.getName()); + mTvBaseGender.setText(o.getSex()); + mTvBasePhone.setText(o.getPhone()); + mTvBaseNative.setText(o.getOriginAddress()); + mTvBaseCurLoc.setText(o.getDomicileAreaName() + "/" + o.getDomicileAddress()); } - @Override protected void onDestroy() { super.onDestroy(); @@ -725,4 +456,5 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity { } } + } \ No newline at end of file diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalListActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalListActivity.java index d9a99f0..69bac5f 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusSpecialCriminalListActivity.java +++ b/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.activitys.census.normal.CensusRegisterDetailActivity; -import com.sucstepsoft.realtimelocation.adapters.CensusPersonAdapter; +import com.sucstepsoft.realtimelocation.adapters.CorrectPersonAdapter; 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 List mDatas = new ArrayList<>(); + private CorrectPersonAdapter mAdapter; + private List 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 -> { - mKeywords = ""; - mEtSearchContent.setText(""); - refreshData(); - }); - mAdapter = new CensusPersonAdapter(mActivity, mDatas); + + mAdapter = new CorrectPersonAdapter(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(); - if (!TextUtils.isEmpty(searchContent)) { - hideSoftKeyboard(); - mKeywords = searchContent; - mCurPage = 1; - getUpcomingList(mCurPage); - } else { - ToastUtils.showShort("请输入要查询的内容"); - } +// String searchContent = mEtSearchContent.getText().toString().trim(); +// if (!TextUtils.isEmpty(searchContent)) { +// hideSoftKeyboard(); +// mKeywords = searchContent; +// mCurPage = 1; +// getUpcomingList(mCurPage); +// } else { +// 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() { @@ -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("id", bean.getReleaseAfterSentenceId()); + intent.putExtra("title", "刑满释放信息编辑"); + 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("idCard", bean.getIdCardNumber()); + intent.putExtra("id", bean.getReleaseId()); + 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() { + .subscribe(new Observer() { @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) { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/CorrectDetailBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/CorrectDetailBean.java index dda65cb..2619055 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/CorrectDetailBean.java +++ b/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; diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/PersonCorrectBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/PersonCorrectBean.java index c33e894..7412d0f 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/PersonCorrectBean.java +++ b/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; } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java index 987d53d..ba65821 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java +++ b/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 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}") - Observable doEditCrime(@Path("releaseAfterSentenceId") String id, @Body RequestBody body, @Header("token") String token); + @PUT("app/release/updaterelease/{releaseId}") + Observable 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 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}") - Observable getCrimeDetailById(@Path("releaseAfterSentenceId") String id, @Header("token") String token); + @GET("app/release/get/{releaseId}") + Observable 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") - Observable getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + @GET("app/release/listpagerelease") + Observable getCrimeList(@Query("populationInfoId")String id,@Query("page") String page, @Query("keywords") String key, @Header("token") String token); /*===========================================社区矫正===========================================*/ diff --git a/app/src/main/res/layout/activity_census_special_crimianl_detail.xml b/app/src/main/res/layout/activity_census_special_crimianl_detail.xml index 192b6ec..f6f926c 100644 --- a/app/src/main/res/layout/activity_census_special_crimianl_detail.xml +++ b/app/src/main/res/layout/activity_census_special_crimianl_detail.xml @@ -1,25 +1,28 @@ + android:orientation="vertical" + android:overScrollMode="never" + android:scrollbars="none"> - + - + + + android:orientation="vertical"> + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_census_special_criminal_add.xml b/app/src/main/res/layout/activity_census_special_criminal_add.xml index 33b2667..e9c6b16 100644 --- a/app/src/main/res/layout/activity_census_special_criminal_add.xml +++ b/app/src/main/res/layout/activity_census_special_criminal_add.xml @@ -1,20 +1,17 @@ + android:scrollbars="none"> - + @@ -25,292 +22,160 @@ android:orientation="vertical"> - + android:orientation="vertical"> + + + android:background="@color/white" + android:orientation="vertical" + android:paddingLeft="20dp" + android:paddingRight="20dp"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="@style/item_title_wrap" + android:text="罪名" /> + android:layout_gravity="center_vertical" /> + + + + + + + style="@style/item_title_wrap" + android:layout_gravity="center_vertical" + android:text="刑期" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:hint="请选择释放时间" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -