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 73f49aa..579697e 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.CensusDrugListActivity; import com.sucstepsoft.realtimelocation.activitys.census.special.CensusSecurityListActivity; import com.sucstepsoft.realtimelocation.activitys.census.special.CensusSpecialCriminalListActivity; import com.sucstepsoft.realtimelocation.beans.OperateBean; @@ -256,11 +257,13 @@ public class CensusRegisterDetailActivity extends BaseActivity { intent.setClass(mActivity, CensusSecurityListActivity.class); startActivity(intent); break; - case "5": + case "5"://吸毒人员 + intent.setClass(mActivity, CensusDrugListActivity.class); + startActivity(intent); break; - case "6": + case "6"://涉邪人员 break; - case "7": + case "7"://重点上访 break; } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugAddActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugAddActivity.java index 67c9232..cee1727 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugAddActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugAddActivity.java @@ -2,16 +2,12 @@ package com.sucstepsoft.realtimelocation.activitys.census.special; import android.app.ProgressDialog; import android.graphics.Color; -import android.os.Bundle; -import android.support.v7.widget.CardView; import android.text.TextUtils; import android.view.View; import android.widget.Button; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.Switch; import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; @@ -28,16 +24,12 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.realtimelocation.R; import com.sucstepsoft.realtimelocation.beans.DicBean; -import com.sucstepsoft.realtimelocation.beans.SearchBaseInfoBean; import com.sucstepsoft.realtimelocation.beans.SuccessBean; -import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean; +import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean; import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean; -import com.sucstepsoft.realtimelocation.beans.person.SaveCorrectBean; import com.sucstepsoft.realtimelocation.beans.person.SaveDrugBean; import com.sucstepsoft.realtimelocation.net.LocationApiService; -import com.sucstepsoft.realtimelocation.services.jpush.TagAliasOperatorHelper; import com.sucstepsoft.realtimelocation.utils.ExceptionHandler; -import com.sucstepsoft.realtimelocation.utils.ReadAssets; import java.text.SimpleDateFormat; import java.util.List; @@ -45,7 +37,6 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; -import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.annotations.NonNull; @@ -58,73 +49,72 @@ import okhttp3.RequestBody; * 特殊人群-吸毒人员 */ public class CensusDrugAddActivity 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.cv_base_info) + LinearLayout mCvBaseInfo; @BindView(R.id.tv_first_date) - TextView mTvFirstDate;//初次发现日期 + TextView mTvFirstDate; @BindView(R.id.tv_control_case) - TextView mTvControlCase;//管控情况 - @BindView(R.id.et_control_name) - EditText mEtControlName;//管控人姓名 + TextView mTvControlCase; @BindView(R.id.et_control_phone) - EditText mEtControlPhone;//管控人联系方式 - @BindView(R.id.et_help_case) - EditText mEtHelpCase;//帮扶情况 - @BindView(R.id.et_help_name) - EditText mEtHelpName;//帮扶人姓名 + EditText mEtControlPhone; + @BindView(R.id.tv_help_status) + TextView mTvHelpStatus; @BindView(R.id.et_help_phone) - EditText mEtHelpPhone;//帮扶人联系方式 - @BindView(R.id.sw_is_crime) - Switch mSwIsCrime;//有无犯罪历史 - @BindView(R.id.et_crime_case) - EditText mEtCrimeCase;//犯罪情况 + EditText mEtHelpPhone; + @BindView(R.id.tv_crime_status) + TextView mTvCrimeStatus; @BindView(R.id.tv_drug_case) - TextView mTvDrugCase;//吸毒原因 + TextView mTvDrugCase; + @BindView(R.id.et_drug_case) + EditText mEtDrugCase; @BindView(R.id.tv_drug_after) - TextView mTvDrugAfter;//吸毒后果 + TextView mTvDrugAfter; @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 List mControlList; private List mDrugCaseList; private List mAfterDrugList; + private List mCrimeList; + private List mHelpList; private OptionsPickerView mControlPicker; + private OptionsPickerView mCrimePicker; + private OptionsPickerView mHelpPicker; private OptionsPickerView mDrugCasePicker; private OptionsPickerView mAfterDrugPicker; private boolean mIsCrime = false; private String mSelControlCase; private String mSelDrugCase; private String mSelDrugAfter; + private String mIdCard; @Override protected int setLayoutId() { @@ -137,6 +127,7 @@ public class CensusDrugAddActivity extends BaseActivity { mLlContent.setVisibility(View.INVISIBLE); //主键 mId = getIntent().getStringExtra("id"); + mIdCard = getIntent().getStringExtra("idCard"); String title = getIntent().getStringExtra("title"); if (!TextUtils.isEmpty(mId)) { //编辑 @@ -145,7 +136,7 @@ public class CensusDrugAddActivity extends BaseActivity { getDetailById(mId); } else { //新增 - mLlSearchContent.setVisibility(View.VISIBLE); + mLlSearchContent.setVisibility(View.GONE); refreshView(STATE_LOAD_SUCCESS); } mTvBaseTitle.setText(title); @@ -156,8 +147,89 @@ public class CensusDrugAddActivity extends BaseActivity { mTvDrugCase.setOnClickListener(v -> onShowDrugCase()); mTvDrugAfter.setOnClickListener(v -> onShowAfterDrug()); mTvFirstDate.setOnClickListener(v -> onShowDate(1)); + mTvHelpStatus.setOnClickListener(v -> onShowHelp()); + mTvCrimeStatus.setOnClickListener(v -> onShowCrime()); + getPersonDetail(); + } - mSwIsCrime.setOnCheckedChangeListener((buttonView, isChecked) -> mIsCrime = isChecked); + private void onShowCrime() { + hideSoftKeyboard(); + if (mCrimeList != null && mCrimeList.size() > 0) { + if (mCrimePicker == null) { + mCrimePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mCrimeList.get(o1); + mTvCrimeStatus.setText(bean.getDictionaryName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mCrimePicker.setPicker(mCrimeList); + } + mCrimePicker.show(); + } else { + getDicListByType(PathConfig.DIC_DRUG_CRIME, 4); + } + } + + /** + * 帮扶qingk + */ + private void onShowHelp() { + hideSoftKeyboard(); + if (mHelpList != null && mHelpList.size() > 0) { + if (mHelpPicker == null) { + mHelpPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mHelpList.get(o1); + mTvHelpStatus.setText(bean.getDictionaryName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mHelpPicker.setPicker(mHelpList); + } + mHelpPicker.show(); + } else { + getDicListByType(PathConfig.DIC_DRUG_HELP, 5); + } + } + + /** + * 获取人员详情 + */ + private void getPersonDetail() { + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getBaseRegisterDetail(mIdCard, UserLgUtils.getToken()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribeOn(Schedulers.io()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseRegisterDetailBean baseRegisterDetailBean) { + //设置基础信息 + setBaseInfo(baseRegisterDetailBean); + refreshView(STATE_LOAD_SUCCESS); + } + + @Override + public void onError(Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); } /** @@ -185,27 +257,6 @@ public class CensusDrugAddActivity extends BaseActivity { } } -// private void getDicListLoc(String s, int i) { -// List tempList = ReadAssets.getAssetsDic(s, mActivity); -// if (tempList != null && tempList.size() > 0) { -// switch (i) { -// case 1: -// mControlList = tempList; -// onShowControlCase(); -// break; -// case 2: -// mDrugCaseList = tempList; -// onShowDrugCase(); -// break; -// case 3: -// mAfterDrugList = tempList; -// onShowAfterDrug(); -// break; -// } -// } else { -// ToastUtils.showShort("暂无数据"); -// } -// } /** * 吸毒原因 @@ -319,6 +370,14 @@ public class CensusDrugAddActivity extends BaseActivity { mAfterDrugList = typeListBeans; onShowAfterDrug(); break; + case 4://犯罪情况 + mCrimeList = typeListBeans; + onShowCrime(); + break; + case 5://帮扶情况 + mHelpList = typeListBeans; + onShowHelp(); + break; } } else { ToastUtils.showShort("暂无数据"); @@ -417,37 +476,25 @@ public class CensusDrugAddActivity extends BaseActivity { private RequestBody buildParams() { SaveDrugBean bean = new SaveDrugBean(); - bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber()); - + bean.setPopulationInfoId(mBaseInfoBean.getPopulationInfoId()); String firstDate = mTvFirstDate.getText().toString().trim(); - bean.setDiscoveryDate(firstDate); + bean.setStartTime(firstDate); String controlCase = mTvControlCase.getText().toString().trim(); - bean.setControlInfo(mSelControlCase); - String controlName = mEtControlName.getText().toString().trim(); - bean.setControlUserName(controlName); + bean.setControl(controlCase); String controlPhone = mEtControlPhone.getText().toString().trim(); - bean.setControlUserPhone(controlPhone); - String helpCase = mEtHelpCase.getText().toString().trim(); - if (!TextUtils.isEmpty(helpCase)) { - bean.setHelpInfo(helpCase); - } - String helpName = mEtHelpName.getText().toString().trim(); - bean.setHelpUserName(helpName); + bean.setControlPhone(controlPhone); + String helpCase = mTvHelpStatus.getText().toString().trim(); + bean.setHelp(helpCase); String helpPhone = mEtHelpPhone.getText().toString().trim(); - bean.setHelpUserPhone(helpPhone); - bean.setHasCrimeHis(mIsCrime ? "1" : "0"); - String crimeCase = mEtCrimeCase.getText().toString().trim(); - if (!TextUtils.isEmpty(crimeCase)) { - bean.setCrimeInfo(crimeCase); - } + bean.setHelpPhone(helpPhone); + String crimieStatue = mTvCrimeStatus.getText().toString().trim(); + bean.setCharge(crimieStatue); String drugCase = mTvDrugCase.getText().toString().trim(); - if (!TextUtils.isEmpty(drugCase)) { - bean.setDrugReason(mSelDrugCase); - } - String drugResult = mTvDrugAfter.getText().toString().trim(); - if (!TextUtils.isEmpty(drugResult)) { - bean.setDrugResult(mSelDrugAfter); - } + bean.setReason(drugCase); + String drugOther = mEtDrugCase.getText().toString().trim(); + bean.setReasonOther(drugOther); + String drugAfter = mTvDrugAfter.getText().toString().trim(); + bean.setConsequence(drugAfter); Gson gson = new Gson(); String obj = gson.toJson(bean); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); @@ -468,26 +515,13 @@ public class CensusDrugAddActivity extends BaseActivity { ToastUtils.showShort("请选择管控情况"); return false; } - String controlName = mEtControlName.getText().toString().trim(); - if (TextUtils.isEmpty(controlName)) { - ToastUtils.showShort("请输入管控人姓名"); - return false; - } + String controlPhone = mEtControlPhone.getText().toString().trim(); if (TextUtils.isEmpty(controlPhone) || !RegexUtils.isPhone(controlPhone)) { ToastUtils.showShort("请输入正确的管控人联系电话"); return false; } - String helpName = mEtHelpName.getText().toString().trim(); - if (TextUtils.isEmpty(helpName)) { - ToastUtils.showShort("请输入帮扶人姓名"); - return false; - } - String helpPhone = mEtHelpPhone.getText().toString().trim(); - if (TextUtils.isEmpty(helpPhone) || !RegexUtils.isPhone(helpPhone)) { - ToastUtils.showShort("请输入正确的帮扶人联系电话"); - return false; - } + return true; } @@ -529,107 +563,38 @@ public class CensusDrugAddActivity extends BaseActivity { * 根据身份证号码收搜人员详细信息 */ private void doSearchPerson() { - 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).getDrugDetailByIdCard(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 DrugDetailBean) { - DrugDetailBean bean = (DrugDetailBean) o; - if (!TextUtils.isEmpty(bean.getAddictsId())) { - 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(DrugDetailBean bean, int type) { - mId = bean.getAddictsId(); - mTvFirstDate.setText(bean.getDiscoveryDate());//初次发现日期 - mTvControlCase.setText(bean.getControlInfoDictionaryName());//管控情况 - mSelControlCase = bean.getControlInfo(); - mEtControlName.setText(bean.getControlUserName());//管控人姓名 - mEtControlPhone.setText(bean.getControlUserPhone());//管控人联系方式 - mEtHelpCase.setText(bean.getHelpInfo());//帮扶情况 - mEtHelpName.setText(bean.getHelpUserName());//帮扶人姓名 - mEtHelpPhone.setText(bean.getHelpUserPhone());//帮扶人联系方式 - mIsCrime = bean.getHasCrimeHis().equals("1"); - mSwIsCrime.setChecked(mIsCrime);//有无犯罪历史 - mEtCrimeCase.setText(bean.getCrimeInfo());//犯罪情况 - mTvDrugCase.setText(bean.getDrugReasonDictionaryName());//吸毒原因 - mSelDrugCase = bean.getDrugReason(); - mTvDrugAfter.setText(bean.getDrugResultDictionaryName());//吸毒后果 - mSelDrugAfter = bean.getDrugResult(); - if (type == 0) { - mEtSearchIdCard.setText(bean.getIdCardNumber()); - doSearchPerson(); - } + mId = bean.getDrugId(); + mTvFirstDate.setText(bean.getStartTime());//初次发现日期 + mTvControlCase.setText(bean.getControl());//管控情况 + mEtControlPhone.setText(bean.getControlPhone());//管控人联系方式 + mTvHelpStatus.setText(bean.getHelp()); + mEtHelpPhone.setText(bean.getHelpPhone());//帮扶人姓名 + mTvCrimeStatus.setText(bean.getCharge()); + mTvDrugCase.setText(bean.getReason());//吸毒原因 + mEtDrugCase.setText(bean.getReasonOther()); + mTvDrugAfter.setText(bean.getConsequence());//吸毒后果 + 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()); } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugDetailActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugDetailActivity.java index afb1261..07ef346 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugDetailActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugDetailActivity.java @@ -1,5 +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; @@ -8,6 +12,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.beans.SearchBaseInfoBean; +import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean; import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean; import com.sucstepsoft.realtimelocation.net.LocationApiService; import com.sucstepsoft.realtimelocation.utils.ExceptionHandler; @@ -24,51 +29,50 @@ import io.reactivex.schedulers.Schedulers; //吸毒人员详情 public class CensusDrugDetailActivity 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.tv_first_date) - TextView mTvFirstDate;//初次发现日期 - @BindView(R.id.tv_control_case) - TextView mTvControlCase;//管控情况 - @BindView(R.id.et_control_name) - TextView mEtControlName;//管控人姓名 - @BindView(R.id.et_control_phone) - TextView mEtControlPhone;//管控人联系方式 - @BindView(R.id.et_help_case) - TextView mEtHelpCase;//帮扶情况 - @BindView(R.id.et_help_name) - TextView mEtHelpName;//帮扶人姓名 - @BindView(R.id.et_help_phone) - TextView mEtHelpPhone;//帮扶人联系方式 - @BindView(R.id.sw_is_crime) - Switch mSwIsCrime;//有无犯罪历史 - @BindView(R.id.et_crime_case) - TextView mEtCrimeCase;//犯罪情况 - @BindView(R.id.tv_drug_case) - TextView mTvDrugCase;//吸毒原因 - @BindView(R.id.tv_drug_after) - TextView mTvDrugAfter;//吸毒后果 + + @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_first_date) + TextView mTvFirstDate; + @BindView(R.id.tv_control_case) + TextView mTvControlCase; + @BindView(R.id.tv_control_phone) + TextView mTvControlPhone; + @BindView(R.id.tv_help_status) + TextView mTvHelpStatus; + @BindView(R.id.tv_help_phone) + TextView mTvHelpPhone; + @BindView(R.id.tv_crime_status) + TextView mTvCrimeStatus; + @BindView(R.id.tv_drug_case) + TextView mTvDrugCase; + @BindView(R.id.tv_drug_other) + TextView mTvDrugOther; + @BindView(R.id.tv_drug_after) + TextView mTvDrugAfter; + @BindView(R.id.ll_content) + LinearLayout mLlContent; private Unbinder mBind; - private SearchBaseInfoBean mBaseInfo; + private BaseRegisterDetailBean mBaseInfo; private DrugDetailBean mDetailBean; @Override @@ -93,9 +97,9 @@ public class CensusDrugDetailActivity extends BaseActivity { * @param idCard */ private void getDetailData(String id, String idCard) { - Observable baseInfo = RetrofitManager.getInstance().create(LocationApiService.class).doSearchBaseInfoByIdCard(idCard, UserLgUtils.getToken()); + Observable baseRegisterDetail = RetrofitManager.getInstance().create(LocationApiService.class).getBaseRegisterDetail(idCard, UserLgUtils.getToken()); Observable registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getDrugDetailById(id, UserLgUtils.getToken()); - Observable.merge(baseInfo, registerInfo) + Observable.merge(baseRegisterDetail, registerInfo) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -106,8 +110,8 @@ public class CensusDrugDetailActivity extends BaseActivity { @Override public void onNext(@NonNull Object o) { - if (o instanceof SearchBaseInfoBean) { - mBaseInfo = (SearchBaseInfoBean) o; + if (o instanceof BaseRegisterDetailBean) { + mBaseInfo = (BaseRegisterDetailBean) o; setBaseInfo(); } else if (o instanceof DrugDetailBean) { mDetailBean = (DrugDetailBean) o; @@ -134,31 +138,26 @@ public class CensusDrugDetailActivity 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() { - mTvFirstDate.setText(mDetailBean.getDiscoveryDate());//初次发现日期 - mTvControlCase.setText(mDetailBean.getControlInfoDictionaryName());//管控情况 - mEtControlName.setText(mDetailBean.getControlUserName());//管控人姓名 - mEtControlPhone.setText(mDetailBean.getControlUserPhone());//管控人联系方式 - mEtHelpCase.setText(mDetailBean.getHelpInfo());//帮扶情况 - mEtHelpName.setText(mDetailBean.getHelpUserName());//帮扶人姓名 - mEtHelpPhone.setText(mDetailBean.getHelpUserPhone());//帮扶人联系方式 - mSwIsCrime.setChecked(mDetailBean.getHasCrimeHis().equals("1"));//有无犯罪历史 - mEtCrimeCase.setText(mDetailBean.getCrimeInfo());//犯罪情况 - mTvDrugCase.setText(mDetailBean.getDrugReasonDictionaryName());//吸毒原因 - mTvDrugAfter.setText(mDetailBean.getDrugResultDictionaryName());//吸毒后果 + mTvFirstDate.setText(mDetailBean.getStartTime());//初次发现日期 + mTvControlCase.setText(mDetailBean.getControl());//管控情况 + mTvControlPhone.setText(mDetailBean.getControlPhone());//管控人联系方式 + mTvHelpStatus.setText(mDetailBean.getHelp()); + mTvHelpPhone.setText(mDetailBean.getHelpPhone());//帮扶人姓名 + mTvCrimeStatus.setText(mDetailBean.getCharge()); + mTvDrugCase.setText(mDetailBean.getReason());//吸毒原因 + mTvDrugOther.setText(mDetailBean.getReasonOther()); + mTvDrugAfter.setText(mDetailBean.getConsequence());//吸毒后果 + } } \ No newline at end of file diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugListActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugListActivity.java index 253eb77..db3efde 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugListActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugListActivity.java @@ -19,8 +19,10 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.realtimelocation.R; import com.sucstepsoft.realtimelocation.adapters.CensusPersonAdapter; +import com.sucstepsoft.realtimelocation.adapters.DrugPersonAdapter; import com.sucstepsoft.realtimelocation.beans.SuccessBean; import com.sucstepsoft.realtimelocation.beans.person.CensusPersonBean; +import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean; import com.sucstepsoft.realtimelocation.net.LocationApiService; import com.sucstepsoft.realtimelocation.utils.ExceptionHandler; @@ -51,10 +53,12 @@ public class CensusDrugListActivity extends BaseActivity { private Unbinder mBind; private String mRows = "20"; private int mCurPage = 1; - private CensusPersonAdapter mAdapter; - private List mDatas = new ArrayList<>(); + private DrugPersonAdapter mAdapter; + private List mDatas = new ArrayList<>(); private Disposable mDisposable; private String mKeywords = ""; + private String mId; + @Override protected int setLayoutId() { return R.layout.activity_census_drug_list; @@ -66,9 +70,11 @@ public class CensusDrugListActivity extends BaseActivity { mTvBaseTitle.setText("吸毒人员"); mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("新增"); + mId = getIntent().getStringExtra("idCard"); mTvPublish.setOnClickListener(v -> { Intent intent = new Intent(mActivity, CensusDrugAddActivity.class); intent.putExtra("title", "吸毒人员信息录入"); + intent.putExtra("idCard", mId); startActivity(intent); }); @@ -79,7 +85,7 @@ public class CensusDrugListActivity extends BaseActivity { refreshData(); }); - mAdapter = new CensusPersonAdapter(mActivity, mDatas); + mAdapter = new DrugPersonAdapter(mActivity, mDatas); LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity); layoutManager.setOrientation(LinearLayoutManager.VERTICAL); mXlvItems.setLayoutManager(layoutManager); @@ -100,18 +106,19 @@ public class CensusDrugListActivity extends BaseActivity { getUpcomingList(mCurPage); } }); - mAdapter.addOnEditListener(new CensusPersonAdapter.OnEditListener() { + mAdapter.addOnEditListener(new DrugPersonAdapter.OnEditListener() { @Override - public void onDel(CensusPersonBean.RowsBean bean, int pos) { + public void onDel(DrugPersonBean.RowsBean bean, int pos) { doDelBean(bean, pos); } @Override - public void onEdit(CensusPersonBean.RowsBean bean, int pos) { + public void onEdit(DrugPersonBean.RowsBean bean, int pos) { doEditBean(bean, pos); } }); } + /** * 搜索 */ @@ -126,13 +133,14 @@ public class CensusDrugListActivity extends BaseActivity { ToastUtils.showShort("请输入要查询的内容"); } } + /** * 删除数据 * * @param bean * @param pos */ - private void doDelBean(CensusPersonBean.RowsBean bean, int pos) { + private void doDelBean(DrugPersonBean.RowsBean bean, int pos) { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); builder.setTitle("提示") .setMessage("确定要删除该条信息吗?") @@ -142,7 +150,7 @@ public class CensusDrugListActivity extends BaseActivity { dialog1.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .doDelDrug(bean.getAddictsId(), UserLgUtils.getToken()) + .doDelDrug(bean.getDrugId(), UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -182,10 +190,11 @@ public class CensusDrugListActivity extends BaseActivity { * @param bean * @param pos */ - private void doEditBean(CensusPersonBean.RowsBean bean, int pos) { + private void doEditBean(DrugPersonBean.RowsBean bean, int pos) { Intent intent = new Intent(mActivity, CensusDrugAddActivity.class); intent.putExtra("title", "吸毒人员信息编辑"); - intent.putExtra("id", bean.getAddictsId()); + intent.putExtra("id", bean.getDrugId()); + intent.putExtra("idCard", bean.getPopulationInfoId()); startActivity(intent); } @@ -194,10 +203,10 @@ public class CensusDrugListActivity extends BaseActivity { * * @param bean */ - private void showDetail(CensusPersonBean.RowsBean bean) { + private void showDetail(DrugPersonBean.RowsBean bean) { Intent intent = new Intent(mActivity, CensusDrugDetailActivity.class); - intent.putExtra("id", bean.getAddictsId()); - intent.putExtra("idCard", bean.getIdCardNumber()); + intent.putExtra("id", bean.getDrugId()); + intent.putExtra("idCard", bean.getPopulationInfoId()); startActivity(intent); } @@ -218,17 +227,17 @@ public class CensusDrugListActivity extends BaseActivity { mCurPage = page; RetrofitManager.getInstance() .create(LocationApiService.class) - .getDrugList(page + "",mKeywords ,UserLgUtils.getToken()) + .getDrugList(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(DrugPersonBean 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/adapters/DrugPersonAdapter.java b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/DrugPersonAdapter.java new file mode 100644 index 0000000..b4f08d3 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/adapters/DrugPersonAdapter.java @@ -0,0 +1,56 @@ +package com.sucstepsoft.realtimelocation.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; +import com.sucstepsoft.realtimelocation.R; +import com.sucstepsoft.realtimelocation.adapters.holders.CensusPersonHolder; +import com.sucstepsoft.realtimelocation.beans.person.CensusPersonBean; +import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 人口adapter + */ +public class DrugPersonAdapter extends BaseRecyclerAdapter { + public DrugPersonAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public CensusPersonHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person, parent, false); + return new CensusPersonHolder(itemView); + } + + @Override + public void bindHolder(CensusPersonHolder censusPersonHolder, int i) { + DrugPersonBean.RowsBean bean = mData.get(i); + censusPersonHolder.mTvName.setText("管控情况:" + bean.getControl()); + censusPersonHolder.mTvNative.setText("初次发现日期:" + bean.getStartTime()); + censusPersonHolder.mTvPhone.setText("管控人联系方式:" + bean.getControlPhone()); + censusPersonHolder.mTvLocation.setVisibility(View.GONE); + censusPersonHolder.mLine.setVisibility(View.GONE); + censusPersonHolder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i)); + censusPersonHolder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i)); + } + + private OnEditListener mEditListener; + + public void addOnEditListener(OnEditListener mListener) { + this.mEditListener = mListener; + } + + public interface OnEditListener { + void onDel(DrugPersonBean.RowsBean bean, int pos); + + void onEdit(DrugPersonBean.RowsBean bean, int pos); + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugDetailBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugDetailBean.java index 13a18c4..ad275f7 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugDetailBean.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugDetailBean.java @@ -8,202 +8,148 @@ package com.sucstepsoft.realtimelocation.beans.person; */ public class DrugDetailBean { - private String addictsId; - private String controlInfo; - private String controlInfoDictionaryName; - private String crimeInfo; - private String discoveryDate; - private String helpUserPhone; - private String idCardNumber; - private String controlUserName; - private String hasCrimeHis; - private String hasCrimeHisDictionaryName; - private String drugResult; - private String drugResultDictionaryName; - private String helpUserName; - private String controlUserPhone; - private String helpInfo; - private String drugReason; - private String drugReasonDictionaryName; - private String fullName; - private String gender; - private String telephone; - private String nativePlace; - private String currentResidence; + private String charge; + private String consequence; + private String control; + private String controlPhone; + private String creator; + private String drugId; + private String gmtCreate; + private String gmtModified; + private String help; + private String helpPhone; + private String isDelete; + private String modifier; + private String populationInfoId; + private String reason; + private String reasonOther; + private String startTime; - public String getAddictsId() { - return addictsId; + public String getCharge() { + return charge; } - public void setAddictsId(String addictsId) { - this.addictsId = addictsId; + public void setCharge(String charge) { + this.charge = charge; } - public String getControlInfo() { - return controlInfo; + public String getConsequence() { + return consequence; } - public void setControlInfo(String controlInfo) { - this.controlInfo = controlInfo; + public void setConsequence(String consequence) { + this.consequence = consequence; } - public String getControlInfoDictionaryName() { - return controlInfoDictionaryName; + public String getControl() { + return control; } - public void setControlInfoDictionaryName(String controlInfoDictionaryName) { - this.controlInfoDictionaryName = controlInfoDictionaryName; + public void setControl(String control) { + this.control = control; } - public String getCrimeInfo() { - return crimeInfo; + public String getControlPhone() { + return controlPhone; } - public void setCrimeInfo(String crimeInfo) { - this.crimeInfo = crimeInfo; + public void setControlPhone(String controlPhone) { + this.controlPhone = controlPhone; } - public String getDiscoveryDate() { - return discoveryDate; + public String getCreator() { + return creator; } - public void setDiscoveryDate(String discoveryDate) { - this.discoveryDate = discoveryDate; + public void setCreator(String creator) { + this.creator = creator; } - public String getHelpUserPhone() { - return helpUserPhone; + public String getDrugId() { + return drugId; } - public void setHelpUserPhone(String helpUserPhone) { - this.helpUserPhone = helpUserPhone; + public void setDrugId(String drugId) { + this.drugId = drugId; } - public String getIdCardNumber() { - return idCardNumber; + public String getGmtCreate() { + return gmtCreate; } - public void setIdCardNumber(String idCardNumber) { - this.idCardNumber = idCardNumber; + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; } - public String getControlUserName() { - return controlUserName; + public String getGmtModified() { + return gmtModified; } - public void setControlUserName(String controlUserName) { - this.controlUserName = controlUserName; + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; } - public String getHasCrimeHis() { - return hasCrimeHis; + public String getHelp() { + return help; } - public void setHasCrimeHis(String hasCrimeHis) { - this.hasCrimeHis = hasCrimeHis; + public void setHelp(String help) { + this.help = help; } - public String getHasCrimeHisDictionaryName() { - return hasCrimeHisDictionaryName; + public String getHelpPhone() { + return helpPhone; } - public void setHasCrimeHisDictionaryName(String hasCrimeHisDictionaryName) { - this.hasCrimeHisDictionaryName = hasCrimeHisDictionaryName; + public void setHelpPhone(String helpPhone) { + this.helpPhone = helpPhone; } - public String getDrugResult() { - return drugResult; + public String getIsDelete() { + return isDelete; } - public void setDrugResult(String drugResult) { - this.drugResult = drugResult; + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; } - public String getDrugResultDictionaryName() { - return drugResultDictionaryName; + public String getModifier() { + return modifier; } - public void setDrugResultDictionaryName(String drugResultDictionaryName) { - this.drugResultDictionaryName = drugResultDictionaryName; + public void setModifier(String modifier) { + this.modifier = modifier; } - public String getHelpUserName() { - return helpUserName; + public String getPopulationInfoId() { + return populationInfoId; } - public void setHelpUserName(String helpUserName) { - this.helpUserName = helpUserName; + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; } - public String getControlUserPhone() { - return controlUserPhone; + public String getReason() { + return reason; } - public void setControlUserPhone(String controlUserPhone) { - this.controlUserPhone = controlUserPhone; + public void setReason(String reason) { + this.reason = reason; } - public String getHelpInfo() { - return helpInfo; + public String getReasonOther() { + return reasonOther; } - public void setHelpInfo(String helpInfo) { - this.helpInfo = helpInfo; + public void setReasonOther(String reasonOther) { + this.reasonOther = reasonOther; } - public String getDrugReason() { - return drugReason; + public String getStartTime() { + return startTime; } - public void setDrugReason(String drugReason) { - this.drugReason = drugReason; - } - - public String getDrugReasonDictionaryName() { - return drugReasonDictionaryName; - } - - public void setDrugReasonDictionaryName(String drugReasonDictionaryName) { - this.drugReasonDictionaryName = drugReasonDictionaryName; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getGender() { - return gender; - } - - public void setGender(String gender) { - this.gender = gender; - } - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - public String getNativePlace() { - return nativePlace; - } - - public void setNativePlace(String nativePlace) { - this.nativePlace = nativePlace; - } - - public String getCurrentResidence() { - return currentResidence; - } - - public void setCurrentResidence(String currentResidence) { - this.currentResidence = currentResidence; + public void setStartTime(String startTime) { + this.startTime = startTime; } } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugPersonBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugPersonBean.java new file mode 100644 index 0000000..2b65bc8 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugPersonBean.java @@ -0,0 +1,181 @@ +package com.sucstepsoft.realtimelocation.beans.person; + +import java.util.List; + +public class DrugPersonBean { + + private int page; + private List rows; + private int total; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String charge; + private String consequence; + private String control; + private String controlPhone; + private String creator; + private String drugId; + private String gmtCreate; + private String gmtModified; + private String help; + private String helpPhone; + private String isDelete; + private String modifier; + private String populationInfoId; + private String reason; + private String reasonOther; + private String startTime; + + public String getCharge() { + return charge; + } + + public void setCharge(String charge) { + this.charge = charge; + } + + public String getConsequence() { + return consequence; + } + + public void setConsequence(String consequence) { + this.consequence = consequence; + } + + public String getControl() { + return control; + } + + public void setControl(String control) { + this.control = control; + } + + public String getControlPhone() { + return controlPhone; + } + + public void setControlPhone(String controlPhone) { + this.controlPhone = controlPhone; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getDrugId() { + return drugId; + } + + public void setDrugId(String drugId) { + this.drugId = drugId; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getGmtModified() { + return gmtModified; + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getHelp() { + return help; + } + + public void setHelp(String help) { + this.help = help; + } + + public String getHelpPhone() { + return helpPhone; + } + + public void setHelpPhone(String helpPhone) { + this.helpPhone = helpPhone; + } + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getPopulationInfoId() { + return populationInfoId; + } + + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getReasonOther() { + return reasonOther; + } + + public void setReasonOther(String reasonOther) { + this.reasonOther = reasonOther; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/SaveDrugBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/SaveDrugBean.java index 33d9d4d..1713dcc 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/SaveDrugBean.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/SaveDrugBean.java @@ -8,157 +8,94 @@ package com.sucstepsoft.realtimelocation.beans.person; */ public class SaveDrugBean { - /** - * controlInfo : string - * controlUserName : string - * controlUserPhone : string - * crimeInfo : string - * discoveryDate : string - * drugReason : string - * drugResult : string - * fullName : string - * gender : string - * hasCrimeHis : string - * helpInfo : string - * helpUserName : string - * helpUserPhone : string - * idCardNumber : string - * telephone : string - */ + private String charge; + private String consequence; + private String control; + private String controlPhone; + private String help; + private String helpPhone; + private String populationInfoId; + private String reason; + private String reasonOther; + private String startTime; - private String controlInfo; - private String controlUserName; - private String controlUserPhone; - private String crimeInfo; - private String discoveryDate; - private String drugReason; - private String drugResult; - private String fullName; - private String gender; - private String hasCrimeHis; - private String helpInfo; - private String helpUserName; - private String helpUserPhone; - private String idCardNumber; - private String telephone; - - public String getControlInfo() { - return controlInfo; + public String getCharge() { + return charge; } - public void setControlInfo(String controlInfo) { - this.controlInfo = controlInfo; + public void setCharge(String charge) { + this.charge = charge; } - public String getControlUserName() { - return controlUserName; + public String getConsequence() { + return consequence; } - public void setControlUserName(String controlUserName) { - this.controlUserName = controlUserName; + public void setConsequence(String consequence) { + this.consequence = consequence; } - public String getControlUserPhone() { - return controlUserPhone; + public String getControl() { + return control; } - public void setControlUserPhone(String controlUserPhone) { - this.controlUserPhone = controlUserPhone; + public void setControl(String control) { + this.control = control; } - public String getCrimeInfo() { - return crimeInfo; + public String getControlPhone() { + return controlPhone; } - public void setCrimeInfo(String crimeInfo) { - this.crimeInfo = crimeInfo; + public void setControlPhone(String controlPhone) { + this.controlPhone = controlPhone; } - public String getDiscoveryDate() { - return discoveryDate; + public String getHelp() { + return help; } - public void setDiscoveryDate(String discoveryDate) { - this.discoveryDate = discoveryDate; + public void setHelp(String help) { + this.help = help; } - public String getDrugReason() { - return drugReason; + public String getHelpPhone() { + return helpPhone; } - public void setDrugReason(String drugReason) { - this.drugReason = drugReason; + public void setHelpPhone(String helpPhone) { + this.helpPhone = helpPhone; } - public String getDrugResult() { - return drugResult; + public String getPopulationInfoId() { + return populationInfoId; } - public void setDrugResult(String drugResult) { - this.drugResult = drugResult; + public void setPopulationInfoId(String populationInfoId) { + this.populationInfoId = populationInfoId; } - public String getFullName() { - return fullName; + public String getReason() { + return reason; } - public void setFullName(String fullName) { - this.fullName = fullName; + public void setReason(String reason) { + this.reason = reason; } - public String getGender() { - return gender; + public String getReasonOther() { + return reasonOther; } - public void setGender(String gender) { - this.gender = gender; + public void setReasonOther(String reasonOther) { + this.reasonOther = reasonOther; } - public String getHasCrimeHis() { - return hasCrimeHis; + public String getStartTime() { + return startTime; } - public void setHasCrimeHis(String hasCrimeHis) { - this.hasCrimeHis = hasCrimeHis; - } - - public String getHelpInfo() { - return helpInfo; - } - - public void setHelpInfo(String helpInfo) { - this.helpInfo = helpInfo; - } - - public String getHelpUserName() { - return helpUserName; - } - - public void setHelpUserName(String helpUserName) { - this.helpUserName = helpUserName; - } - - public String getHelpUserPhone() { - return helpUserPhone; - } - - public void setHelpUserPhone(String helpUserPhone) { - this.helpUserPhone = helpUserPhone; - } - - public String getIdCardNumber() { - return idCardNumber; - } - - public void setIdCardNumber(String idCardNumber) { - this.idCardNumber = idCardNumber; - } - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; + public void setStartTime(String startTime) { + this.startTime = startTime; } } 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 ddf6441..28aab33 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java @@ -53,6 +53,7 @@ import com.sucstepsoft.realtimelocation.beans.person.CensusYoungDetailBean; import com.sucstepsoft.realtimelocation.beans.person.CommunityListBean; import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean; import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean; +import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean; import com.sucstepsoft.realtimelocation.beans.person.HouseDetailBean; import com.sucstepsoft.realtimelocation.beans.person.HouseListBean; import com.sucstepsoft.realtimelocation.beans.person.OutboundDetailBean; @@ -1240,29 +1241,29 @@ public interface LocationApiService { * 保存吸毒人员 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @POST("app/addicts/saveaddicts") + @POST("app/drug/save") Observable doSaveDrug(@Body RequestBody body, @Header("token") String token); /** * 编辑吸毒人员 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @PUT("app/addicts/updateaddicts/{addictsId}") - Observable doEditDrug(@Path("addictsId") String id, @Body RequestBody body, @Header("token") String token); + @PUT("app/drug/updatedrug/{drugId}") + Observable doEditDrug(@Path("drugId") String id, @Body RequestBody body, @Header("token") String token); /** * 删除吸毒 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @DELETE("app/addicts/removeaddicts/{ids}") + @DELETE("app/drug/remove/{ids}") Observable doDelDrug(@Path("ids") String id, @Header("token") String token); /** * 根据ID获取详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/addicts/getaddictsbyid/{addictsId}") - Observable getDrugDetailById(@Path("addictsId") String id, @Header("token") String token); + @GET("app/drug/get/{drugId}") + Observable getDrugDetailById(@Path("drugId") String id, @Header("token") String token); /** * 根据身份证号码获取详情 @@ -1275,8 +1276,8 @@ public interface LocationApiService { * 吸毒人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/addicts/listpageaddicts") - Observable getDrugList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + @GET("app/drug/listpagedrug") + Observable getDrugList(@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_drug_add.xml b/app/src/main/res/layout/activity_census_drug_add.xml index aca2447..0f33234 100644 --- a/app/src/main/res/layout/activity_census_drug_add.xml +++ b/app/src/main/res/layout/activity_census_drug_add.xml @@ -1,7 +1,5 @@ - + @@ -23,263 +23,186 @@ android:layout_height="wrap_content" android:orientation="vertical"> + - + android:background="@color/white" + android:orientation="vertical" + android:paddingLeft="20dp" + android:paddingRight="20dp"> + + - + style="@style/item_title_wrap" + android:text="初次发现日期" /> - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - + - - - - - + + - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -