gaojian/citygovernance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

刑满释放人员.户籍信息

Browse Source
This commit is contained in:
高健 2021-10-25 15:56:49 +08:00
parent 232ab402cf
commit 98e7a20122
26 changed files with 1155 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
View File

@ -64,6 +64,7 @@ public class PathConfig {
//=========================字典ID===================================
public static final String DIC_RELATION = "4c21d91a-d5e1-4cfc-a18a-d63272763cdb";//与户主关系
public static final String DIC_ACCORD = "2156b4da-0be5-46d5-81c5-f1dcf0b30359";//人户是否一致
public static final String DIC_CARD_TYPE = "76c5044f-805a-4313-b1e8-79e966b97c0d";//证件类型
// public static final String DIC_CARD_TYPE = "35c6e331-9dd4-425c-be0c-ce570a0a768d";//TODO 证件类型
public static final String DIC_HOUSE_TYPE = "bd3ceeb7-a523-4532-901d-5ab4046ebae3";//住所类型

57
commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusCriminalAdapter.java Normal file
View File

@ -0,0 +1,57 @@
package com.tengshisoft.commonmodule.adapters;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.CensusCriminalListBean;
import com.tengshisoft.commonmodule.beans.CensusRegisterListBean;
import com.tengshisoft.commonmodule.holders.CensusCriminalHolder;
import com.tengshisoft.commonmodule.holders.CensusPersonRegisterHolder;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import com.tenlionsoft.baselib.utils.IDCard;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/11/17 - 1:22 PM
* 邮箱: itgaojian@163.com
* 描述: 人口 刑满释放人员
*/
public class CensusCriminalAdapter extends BaseRecyclerAdapter<CensusCriminalListBean.RowsBean, CensusCriminalHolder> {
public CensusCriminalAdapter(Context ctx, List<CensusCriminalListBean.RowsBean> list) {
super(ctx, list);
}
@Override
public CensusCriminalHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person_criminal, parent, false);
return new CensusCriminalHolder(itemView);
}
@Override
public void bindHolder(CensusCriminalHolder censusPersonHolder, int i) {
CensusCriminalListBean.RowsBean bean = mData.get(i);
censusPersonHolder.mTvName.setText(bean.getFullName());
censusPersonHolder.mTvCharge.setText("罪名:" + bean.getNameOfOriginalSinDict());
censusPersonHolder.mTvIdCard.setText("身份证号:" + IDCard.idMask(bean.getIdCardNumber(), 10, 4));
censusPersonHolder.mTvTime.setText("释放日期:" + bean.getReleaseDate());
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(CensusCriminalListBean.RowsBean bean, int pos);
void onEdit(CensusCriminalListBean.RowsBean bean, int pos);
}
}

57
commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusRegisterAdapter.java Normal file
View File

@ -0,0 +1,57 @@
package com.tengshisoft.commonmodule.adapters;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.CensusPersonBean;
import com.tengshisoft.commonmodule.beans.CensusRegisterListBean;
import com.tengshisoft.commonmodule.holders.CensusPersonHolder;
import com.tengshisoft.commonmodule.holders.CensusPersonRegisterHolder;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import com.tenlionsoft.baselib.utils.IDCard;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/11/17 - 1:22 PM
* 邮箱: itgaojian@163.com
* 描述: 人口 户籍信息
*/
public class CensusRegisterAdapter extends BaseRecyclerAdapter<CensusRegisterListBean.RowsBean, CensusPersonRegisterHolder> {
public CensusRegisterAdapter(Context ctx, List<CensusRegisterListBean.RowsBean> list) {
super(ctx, list);
}
@Override
public CensusPersonRegisterHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person_register, parent, false);
return new CensusPersonRegisterHolder(itemView);
}
@Override
public void bindHolder(CensusPersonRegisterHolder censusPersonHolder, int i) {
CensusRegisterListBean.RowsBean bean = mData.get(i);
censusPersonHolder.mTvName.setText(bean.getFullName());
censusPersonHolder.mTvLocation.setText("户号:" + bean.getCensusNumber());
censusPersonHolder.mTvIdCard.setText("身份证号:" + IDCard.idMask(bean.getIdCardNumber(), 10, 4));
censusPersonHolder.mTvHandUser.setText("户主:" + bean.getNameOfHouseholder());
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(CensusRegisterListBean.RowsBean bean, int pos);
void onEdit(CensusRegisterListBean.RowsBean bean, int pos);
}
}

329
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCrimeDetailBean.java
View File

@ -8,96 +8,27 @@ package com.tengshisoft.commonmodule.beans;
*/
public class CensusCrimeDetailBean {
private String releaseAfterSentenceId;
private String idCardNumber;
private String isCumulativeCrime;
private String nameOfOriginalSin;
private String nameOfOriginalSinDictionaryName;
private String originalSentenceData;
private String servingSentencePlace;
private String releaseDate;
private String assessmentRiskType;
private String assessmentRiskTypeDictionaryName;
private String linkUpDate;
private String linkUpSituation;
private String linkUpSituationDictionaryName;
private String placementDate;
private String placementSituation;
private String placementSituationDictionaryName;
private String unPlacementReason;
private String helpAndEducate;
private String isCrimeAgain;
private String isCrimeAgainDictionaryName;
private String assessmentRiskTypeDict;
private String crimeAgainCharge;
private String fullName;
private String gender;
private String telephone;
private String nativePlace;
private String currentResidence;
public String getReleaseAfterSentenceId() {
return releaseAfterSentenceId;
}
public void setReleaseAfterSentenceId(String releaseAfterSentenceId) {
this.releaseAfterSentenceId = releaseAfterSentenceId;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getIsCumulativeCrime() {
return isCumulativeCrime;
}
public void setIsCumulativeCrime(String isCumulativeCrime) {
this.isCumulativeCrime = isCumulativeCrime;
}
public String getNameOfOriginalSin() {
return nameOfOriginalSin;
}
public void setNameOfOriginalSin(String nameOfOriginalSin) {
this.nameOfOriginalSin = nameOfOriginalSin;
}
public String getNameOfOriginalSinDictionaryName() {
return nameOfOriginalSinDictionaryName;
}
public void setNameOfOriginalSinDictionaryName(String nameOfOriginalSinDictionaryName) {
this.nameOfOriginalSinDictionaryName = nameOfOriginalSinDictionaryName;
}
public String getOriginalSentenceData() {
return originalSentenceData;
}
public void setOriginalSentenceData(String originalSentenceData) {
this.originalSentenceData = originalSentenceData;
}
public String getServingSentencePlace() {
return servingSentencePlace;
}
public void setServingSentencePlace(String servingSentencePlace) {
this.servingSentencePlace = servingSentencePlace;
}
public String getReleaseDate() {
return releaseDate;
}
public void setReleaseDate(String releaseDate) {
this.releaseDate = releaseDate;
}
private String helpAndEducate;
private String idCardNumber;
private String isCrimeAgain;
private String isCumulativeCrime;
private String linkUpDate;
private String linkUpSituation;
private String linkUpSituationDict;
private String nameOfOriginalSin;
private String nameOfOriginalSinDict;
private String originalSentenceData;
private String placementDate;
private String placementSituation;
private String placementSituationDict;
private String releaseAfterSentenceId;
private String releaseDate;
private String servingSentencePlace;
private String unPlacementReason;
public String getAssessmentRiskType() {
return assessmentRiskType;
@ -107,92 +38,12 @@ public class CensusCrimeDetailBean {
this.assessmentRiskType = assessmentRiskType;
}
public String getAssessmentRiskTypeDictionaryName() {
return assessmentRiskTypeDictionaryName;
public String getAssessmentRiskTypeDict() {
return assessmentRiskTypeDict;
}
public void setAssessmentRiskTypeDictionaryName(String assessmentRiskTypeDictionaryName) {
this.assessmentRiskTypeDictionaryName = assessmentRiskTypeDictionaryName;
}
public String getLinkUpDate() {
return linkUpDate;
}
public void setLinkUpDate(String linkUpDate) {
this.linkUpDate = linkUpDate;
}
public String getLinkUpSituation() {
return linkUpSituation;
}
public void setLinkUpSituation(String linkUpSituation) {
this.linkUpSituation = linkUpSituation;
}
public String getLinkUpSituationDictionaryName() {
return linkUpSituationDictionaryName;
}
public void setLinkUpSituationDictionaryName(String linkUpSituationDictionaryName) {
this.linkUpSituationDictionaryName = linkUpSituationDictionaryName;
}
public String getPlacementDate() {
return placementDate;
}
public void setPlacementDate(String placementDate) {
this.placementDate = placementDate;
}
public String getPlacementSituation() {
return placementSituation;
}
public void setPlacementSituation(String placementSituation) {
this.placementSituation = placementSituation;
}
public String getPlacementSituationDictionaryName() {
return placementSituationDictionaryName;
}
public void setPlacementSituationDictionaryName(String placementSituationDictionaryName) {
this.placementSituationDictionaryName = placementSituationDictionaryName;
}
public String getUnPlacementReason() {
return unPlacementReason;
}
public void setUnPlacementReason(String unPlacementReason) {
this.unPlacementReason = unPlacementReason;
}
public String getHelpAndEducate() {
return helpAndEducate;
}
public void setHelpAndEducate(String helpAndEducate) {
this.helpAndEducate = helpAndEducate;
}
public String getIsCrimeAgain() {
return isCrimeAgain;
}
public void setIsCrimeAgain(String isCrimeAgain) {
this.isCrimeAgain = isCrimeAgain;
}
public String getIsCrimeAgainDictionaryName() {
return isCrimeAgainDictionaryName;
}
public void setIsCrimeAgainDictionaryName(String isCrimeAgainDictionaryName) {
this.isCrimeAgainDictionaryName = isCrimeAgainDictionaryName;
public void setAssessmentRiskTypeDict(String assessmentRiskTypeDict) {
this.assessmentRiskTypeDict = assessmentRiskTypeDict;
}
public String getCrimeAgainCharge() {
@ -211,35 +62,139 @@ public class CensusCrimeDetailBean {
this.fullName = fullName;
}
public String getGender() {
return gender;
public String getHelpAndEducate() {
return helpAndEducate;
}
public void setGender(String gender) {
this.gender = gender;
public void setHelpAndEducate(String helpAndEducate) {
this.helpAndEducate = helpAndEducate;
}
public String getTelephone() {
return telephone;
public String getIdCardNumber() {
return idCardNumber;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getNativePlace() {
return nativePlace;
public String getIsCrimeAgain() {
return isCrimeAgain;
}
public void setNativePlace(String nativePlace) {
this.nativePlace = nativePlace;
public void setIsCrimeAgain(String isCrimeAgain) {
this.isCrimeAgain = isCrimeAgain;
}
public String getCurrentResidence() {
return currentResidence;
public String getIsCumulativeCrime() {
return isCumulativeCrime;
}
public void setCurrentResidence(String currentResidence) {
this.currentResidence = currentResidence;
public void setIsCumulativeCrime(String isCumulativeCrime) {
this.isCumulativeCrime = isCumulativeCrime;
}
public String getLinkUpDate() {
return linkUpDate;
}
public void setLinkUpDate(String linkUpDate) {
this.linkUpDate = linkUpDate;
}
public String getLinkUpSituation() {
return linkUpSituation;
}
public void setLinkUpSituation(String linkUpSituation) {
this.linkUpSituation = linkUpSituation;
}
public String getLinkUpSituationDict() {
return linkUpSituationDict;
}
public void setLinkUpSituationDict(String linkUpSituationDict) {
this.linkUpSituationDict = linkUpSituationDict;
}
public String getNameOfOriginalSin() {
return nameOfOriginalSin;
}
public void setNameOfOriginalSin(String nameOfOriginalSin) {
this.nameOfOriginalSin = nameOfOriginalSin;
}
public String getNameOfOriginalSinDict() {
return nameOfOriginalSinDict;
}
public void setNameOfOriginalSinDict(String nameOfOriginalSinDict) {
this.nameOfOriginalSinDict = nameOfOriginalSinDict;
}
public String getOriginalSentenceData() {
return originalSentenceData;
}
public void setOriginalSentenceData(String originalSentenceData) {
this.originalSentenceData = originalSentenceData;
}
public String getPlacementDate() {
return placementDate;
}
public void setPlacementDate(String placementDate) {
this.placementDate = placementDate;
}
public String getPlacementSituation() {
return placementSituation;
}
public void setPlacementSituation(String placementSituation) {
this.placementSituation = placementSituation;
}
public String getPlacementSituationDict() {
return placementSituationDict;
}
public void setPlacementSituationDict(String placementSituationDict) {
this.placementSituationDict = placementSituationDict;
}
public String getReleaseAfterSentenceId() {
return releaseAfterSentenceId;
}
public void setReleaseAfterSentenceId(String releaseAfterSentenceId) {
this.releaseAfterSentenceId = releaseAfterSentenceId;
}
public String getReleaseDate() {
return releaseDate;
}
public void setReleaseDate(String releaseDate) {
this.releaseDate = releaseDate;
}
public String getServingSentencePlace() {
return servingSentencePlace;
}
public void setServingSentencePlace(String servingSentencePlace) {
this.servingSentencePlace = servingSentencePlace;
}
public String getUnPlacementReason() {
return unPlacementReason;
}
public void setUnPlacementReason(String unPlacementReason) {
this.unPlacementReason = unPlacementReason;
}
}

232
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCriminalListBean.java Normal file
View File

@ -0,0 +1,232 @@
package com.tengshisoft.commonmodule.beans;
import java.util.List;
/**
* 作者: adam
* 日期: 2021/10/25 - 3:20 下午
* 邮箱: itgaojian@163.com
* 描述: 人口 刑满释放人员
*/
public class CensusCriminalListBean {
private int page;
private int total;
private List<RowsBean> rows;
public int getPage() {
return page;
}
public void setPage(int page) {
this.page = page;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<RowsBean> getRows() {
return rows;
}
public void setRows(List<RowsBean> rows) {
this.rows = rows;
}
public static class RowsBean {
private String assessmentRiskType;
private String assessmentRiskTypeDict;
private String crimeAgainCharge;
private String fullName;
private String helpAndEducate;
private String idCardNumber;
private String isCrimeAgain;
private String isCumulativeCrime;
private String linkUpDate;
private String linkUpSituation;
private String linkUpSituationDict;
private String nameOfOriginalSin;
private String nameOfOriginalSinDict;
private String originalSentenceData;
private String placementDate;
private String placementSituation;
private String placementSituationDict;
private String releaseAfterSentenceId;
private String releaseDate;
private String servingSentencePlace;
private String unPlacementReason;
public String getAssessmentRiskType() {
return assessmentRiskType;
}
public void setAssessmentRiskType(String assessmentRiskType) {
this.assessmentRiskType = assessmentRiskType;
}
public String getAssessmentRiskTypeDict() {
return assessmentRiskTypeDict;
}
public void setAssessmentRiskTypeDict(String assessmentRiskTypeDict) {
this.assessmentRiskTypeDict = assessmentRiskTypeDict;
}
public String getCrimeAgainCharge() {
return crimeAgainCharge;
}
public void setCrimeAgainCharge(String crimeAgainCharge) {
this.crimeAgainCharge = crimeAgainCharge;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getHelpAndEducate() {
return helpAndEducate;
}
public void setHelpAndEducate(String helpAndEducate) {
this.helpAndEducate = helpAndEducate;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getIsCrimeAgain() {
return isCrimeAgain;
}
public void setIsCrimeAgain(String isCrimeAgain) {
this.isCrimeAgain = isCrimeAgain;
}
public String getIsCumulativeCrime() {
return isCumulativeCrime;
}
public void setIsCumulativeCrime(String isCumulativeCrime) {
this.isCumulativeCrime = isCumulativeCrime;
}
public String getLinkUpDate() {
return linkUpDate;
}
public void setLinkUpDate(String linkUpDate) {
this.linkUpDate = linkUpDate;
}
public String getLinkUpSituation() {
return linkUpSituation;
}
public void setLinkUpSituation(String linkUpSituation) {
this.linkUpSituation = linkUpSituation;
}
public String getLinkUpSituationDict() {
return linkUpSituationDict;
}
public void setLinkUpSituationDict(String linkUpSituationDict) {
this.linkUpSituationDict = linkUpSituationDict;
}
public String getNameOfOriginalSin() {
return nameOfOriginalSin;
}
public void setNameOfOriginalSin(String nameOfOriginalSin) {
this.nameOfOriginalSin = nameOfOriginalSin;
}
public String getNameOfOriginalSinDict() {
return nameOfOriginalSinDict;
}
public void setNameOfOriginalSinDict(String nameOfOriginalSinDict) {
this.nameOfOriginalSinDict = nameOfOriginalSinDict;
}
public String getOriginalSentenceData() {
return originalSentenceData;
}
public void setOriginalSentenceData(String originalSentenceData) {
this.originalSentenceData = originalSentenceData;
}
public String getPlacementDate() {
return placementDate;
}
public void setPlacementDate(String placementDate) {
this.placementDate = placementDate;
}
public String getPlacementSituation() {
return placementSituation;
}
public void setPlacementSituation(String placementSituation) {
this.placementSituation = placementSituation;
}
public String getPlacementSituationDict() {
return placementSituationDict;
}
public void setPlacementSituationDict(String placementSituationDict) {
this.placementSituationDict = placementSituationDict;
}
public String getReleaseAfterSentenceId() {
return releaseAfterSentenceId;
}
public void setReleaseAfterSentenceId(String releaseAfterSentenceId) {
this.releaseAfterSentenceId = releaseAfterSentenceId;
}
public String getReleaseDate() {
return releaseDate;
}
public void setReleaseDate(String releaseDate) {
this.releaseDate = releaseDate;
}
public String getServingSentencePlace() {
return servingSentencePlace;
}
public void setServingSentencePlace(String servingSentencePlace) {
this.servingSentencePlace = servingSentencePlace;
}
public String getUnPlacementReason() {
return unPlacementReason;
}
public void setUnPlacementReason(String unPlacementReason) {
this.unPlacementReason = unPlacementReason;
}
}
}

83
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterDetailBean.java
View File

@ -8,48 +8,17 @@ package com.tengshisoft.commonmodule.beans;
*/
public class CensusRegisterDetailBean {
/**
* baseId : string
* censusMsgId : string
* censusNumber : string
* contact : string
* currentResidence : string
* fullName : string
* gender : string
* idCardNumber : string
* idCardOfHouseholder : string
* nameOfHouseholder : string
* nativePlace : string
* peopleSameCensus : string
* relationshipWithHouseholder : string
* relationshipWithHouseholderDictionaryName : string
* telephone : string
*/
private String baseId;
private String censusMsgId;
private String censusNumber;
private String contact;
private String currentResidence;
private String fullName;
private String gender;
private String idCardNumber;
private String idCardOfHouseholder;
private String nameOfHouseholder;
private String nativePlace;
private String peopleSameCensus;
private String peopleSameCensusDict;
private String relationshipWithHouseholder;
private String relationshipWithHouseholderDictionaryName;
private String telephone;
public String getBaseId() {
return baseId;
}
public void setBaseId(String baseId) {
this.baseId = baseId;
}
private String relationshipWithHouseholderDict;
public String getCensusMsgId() {
return censusMsgId;
@ -75,14 +44,6 @@ public class CensusRegisterDetailBean {
this.contact = contact;
}
public String getCurrentResidence() {
return currentResidence;
}
public void setCurrentResidence(String currentResidence) {
this.currentResidence = currentResidence;
}
public String getFullName() {
return fullName;
}
@ -91,14 +52,6 @@ public class CensusRegisterDetailBean {
this.fullName = fullName;
}
public String getGender() {
return gender;
}
public void setGender(String gender) {
this.gender = gender;
}
public String getIdCardNumber() {
return idCardNumber;
}
@ -123,14 +76,6 @@ public class CensusRegisterDetailBean {
this.nameOfHouseholder = nameOfHouseholder;
}
public String getNativePlace() {
return nativePlace;
}
public void setNativePlace(String nativePlace) {
this.nativePlace = nativePlace;
}
public String getPeopleSameCensus() {
return peopleSameCensus;
}
@ -139,6 +84,14 @@ public class CensusRegisterDetailBean {
this.peopleSameCensus = peopleSameCensus;
}
public String getPeopleSameCensusDict() {
return peopleSameCensusDict;
}
public void setPeopleSameCensusDict(String peopleSameCensusDict) {
this.peopleSameCensusDict = peopleSameCensusDict;
}
public String getRelationshipWithHouseholder() {
return relationshipWithHouseholder;
}
@ -147,19 +100,11 @@ public class CensusRegisterDetailBean {
this.relationshipWithHouseholder = relationshipWithHouseholder;
}
public String getRelationshipWithHouseholderDictionaryName() {
return relationshipWithHouseholderDictionaryName;
public String getRelationshipWithHouseholderDict() {
return relationshipWithHouseholderDict;
}
public void setRelationshipWithHouseholderDictionaryName(String relationshipWithHouseholderDictionaryName) {
this.relationshipWithHouseholderDictionaryName = relationshipWithHouseholderDictionaryName;
}
public String getTelephone() {
return telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
public void setRelationshipWithHouseholderDict(String relationshipWithHouseholderDict) {
this.relationshipWithHouseholderDict = relationshipWithHouseholderDict;
}
}

142
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterListBean.java Normal file
View File

@ -0,0 +1,142 @@
package com.tengshisoft.commonmodule.beans;
import java.util.List;
/**
* 作者: adam
* 日期: 2021/10/25 - 2:19 下午
* 邮箱: itgaojian@163.com
* 描述: 人口系统---户籍信息
*/
public class CensusRegisterListBean {
private int page;
private int total;
private List<RowsBean> rows;
public int getPage() {
return page;
}
public void setPage(int page) {
this.page = page;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<RowsBean> getRows() {
return rows;
}
public void setRows(List<RowsBean> rows) {
this.rows = rows;
}
public static class RowsBean {
private String censusMsgId;
private String censusNumber;
private String contact;
private String fullName;
private String idCardNumber;
private String idCardOfHouseholder;
private String nameOfHouseholder;
private String peopleSameCensus;
private String peopleSameCensusDict;
private String relationshipWithHouseholder;
private String relationshipWithHouseholderDict;
public String getCensusMsgId() {
return censusMsgId;
}
public void setCensusMsgId(String censusMsgId) {
this.censusMsgId = censusMsgId;
}
public String getCensusNumber() {
return censusNumber;
}
public void setCensusNumber(String censusNumber) {
this.censusNumber = censusNumber;
}
public String getContact() {
return contact;
}
public void setContact(String contact) {
this.contact = contact;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getIdCardOfHouseholder() {
return idCardOfHouseholder;
}
public void setIdCardOfHouseholder(String idCardOfHouseholder) {
this.idCardOfHouseholder = idCardOfHouseholder;
}
public String getNameOfHouseholder() {
return nameOfHouseholder;
}
public void setNameOfHouseholder(String nameOfHouseholder) {
this.nameOfHouseholder = nameOfHouseholder;
}
public String getPeopleSameCensus() {
return peopleSameCensus;
}
public void setPeopleSameCensus(String peopleSameCensus) {
this.peopleSameCensus = peopleSameCensus;
}
public String getPeopleSameCensusDict() {
return peopleSameCensusDict;
}
public void setPeopleSameCensusDict(String peopleSameCensusDict) {
this.peopleSameCensusDict = peopleSameCensusDict;
}
public String getRelationshipWithHouseholder() {
return relationshipWithHouseholder;
}
public void setRelationshipWithHouseholder(String relationshipWithHouseholder) {
this.relationshipWithHouseholder = relationshipWithHouseholder;
}
public String getRelationshipWithHouseholderDict() {
return relationshipWithHouseholderDict;
}
public void setRelationshipWithHouseholderDict(String relationshipWithHouseholderDict) {
this.relationshipWithHouseholderDict = relationshipWithHouseholderDict;
}
}
}

37
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusmsgBean.java
View File

@ -8,30 +8,23 @@ package com.tengshisoft.commonmodule.beans;
*/
public class CensusmsgBean {
/**
* baseId : string
* censusNumber : string
* contact : string
* idCardOfHouseholder : string
* nameOfHouseholder : string
* peopleSameCensus : string
* relationshipWithHouseholder : string
*/
private String baseId;
private String censusMsgId;
private String censusNumber;
private String contact;
private String fullName;
private String idCardNumber;
private String idCardOfHouseholder;
private String nameOfHouseholder;
private String peopleSameCensus;
private String relationshipWithHouseholder;
public String getBaseId() {
return baseId;
public String getCensusMsgId() {
return censusMsgId;
}
public void setBaseId(String baseId) {
this.baseId = baseId;
public void setCensusMsgId(String censusMsgId) {
this.censusMsgId = censusMsgId;
}
public String getCensusNumber() {
@ -50,6 +43,22 @@ public class CensusmsgBean {
this.contact = contact;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getIdCardOfHouseholder() {
return idCardOfHouseholder;
}

35
commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCrimeBean.java
View File

@ -8,26 +8,10 @@ package com.tengshisoft.commonmodule.beans;
*/
public class SaveCrimeBean {
/**
* assessmentRiskType : string
* crimeAgainCharge : string
* helpAndEducate : string
* idCardNumber : string
* isCrimeAgain : string
* isCumulativeCrime : string
* linkUpDate : string
* linkUpSituation : string
* nameOfOriginalSin : string
* originalSentenceData : string
* placementDate : string
* placementSituation : string
* releaseDate : string
* servingSentencePlace : string
* unPlacementReason : string
*/
private String assessmentRiskType;
private String crimeAgainCharge;
private String fullName;
private String helpAndEducate;
private String idCardNumber;
private String isCrimeAgain;
@ -38,6 +22,7 @@ public class SaveCrimeBean {
private String originalSentenceData;
private String placementDate;
private String placementSituation;
private String releaseAfterSentenceId;
private String releaseDate;
private String servingSentencePlace;
private String unPlacementReason;
@ -58,6 +43,14 @@ public class SaveCrimeBean {
this.crimeAgainCharge = crimeAgainCharge;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getHelpAndEducate() {
return helpAndEducate;
}
@ -138,6 +131,14 @@ public class SaveCrimeBean {
this.placementSituation = placementSituation;
}
public String getReleaseAfterSentenceId() {
return releaseAfterSentenceId;
}
public void setReleaseAfterSentenceId(String releaseAfterSentenceId) {
this.releaseAfterSentenceId = releaseAfterSentenceId;
}
public String getReleaseDate() {
return releaseDate;
}

40
commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusCriminalHolder.java Normal file
View File

@ -0,0 +1,40 @@
package com.tengshisoft.commonmodule.holders;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.tengshisoft.commonmodule.R;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者: adam
* 日期: 2020/11/17 - 1:19 PM
* 邮箱: itgaojian@163.com
* 描述: 人口 刑满释放人员
*/
public class CensusCriminalHolder extends RecyclerView.ViewHolder {
public TextView mTvName;
public TextView mTvIdCard;
public TextView mTvCharge;
public TextView mTvTime;
public Button mBtnDel;
public Button mBtnEdit;
public CensusCriminalHolder(@NonNull View itemView) {
super(itemView);
mTvName = itemView.findViewById(R.id.tv_name);
mTvCharge = itemView.findViewById(R.id.tv_charge);
mBtnDel = itemView.findViewById(R.id.btn_del);
mBtnEdit = itemView.findViewById(R.id.btn_edit);
mTvTime = itemView.findViewById(R.id.tv_time);
mTvIdCard = itemView.findViewById(R.id.tv_id_card);
}
}

37
commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusPersonRegisterHolder.java Normal file
View File

@ -0,0 +1,37 @@
package com.tengshisoft.commonmodule.holders;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.tengshisoft.commonmodule.R;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者: adam
* 日期: 2020/11/17 - 1:19 PM
* 邮箱: itgaojian@163.com
* 描述: 人口 户籍信息
*/
public class CensusPersonRegisterHolder extends RecyclerView.ViewHolder {
public TextView mTvName;
public TextView mTvLocation;
public TextView mTvHandUser;
public TextView mTvIdCard;
public Button mBtnDel;
public Button mBtnEdit;
public CensusPersonRegisterHolder(@NonNull View itemView) {
super(itemView);
mTvName = itemView.findViewById(R.id.tv_name);
mTvLocation = itemView.findViewById(R.id.tv_location);
mBtnDel = itemView.findViewById(R.id.btn_del);
mBtnEdit = itemView.findViewById(R.id.btn_edit);
mTvHandUser = itemView.findViewById(R.id.tv_hand_user);
mTvIdCard = itemView.findViewById(R.id.tv_id_card);
}
}

23
commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java
View File

@ -8,9 +8,11 @@ import com.tengshisoft.commonmodule.beans.BuildingManagerListBean;
import com.tengshisoft.commonmodule.beans.CaseComponentListBean;
import com.tengshisoft.commonmodule.beans.CaseTypeBean;
import com.tengshisoft.commonmodule.beans.CensusCrimeDetailBean;
import com.tengshisoft.commonmodule.beans.CensusCriminalListBean;
import com.tengshisoft.commonmodule.beans.CensusPersonBean;
import com.tengshisoft.commonmodule.beans.CensusRearDetailBean;
import com.tengshisoft.commonmodule.beans.CensusRegisterDetailBean;
import com.tengshisoft.commonmodule.beans.CensusRegisterListBean;
import com.tengshisoft.commonmodule.beans.ChoosePersonListBean;
import com.tengshisoft.commonmodule.beans.CommunityListBean;
import com.tengshisoft.commonmodule.beans.ComponentDetailBean;
@ -360,6 +362,7 @@ public interface Apis {
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/basepopulationinfo/getbasepopulationinfobyid/{basePopulationInfoId}")
Observable<PersonSearchBean> getBaseInfoDetailById(@Path("basePopulationInfoId") String id, @Header("token") String token);
/*===============================================户籍信息================================================*/
/**
* 删除人员户籍信息
@ -373,21 +376,21 @@ public interface Apis {
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/censusmsg/listpagecensusmsg")
Observable<CensusPersonBean> getCensusRegister(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
Observable<CensusRegisterListBean> getCensusRegister(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
/**
* 户籍信息详情
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/censusmsg/getcensusmsgbyid/{censusMsgId}")
Observable<CensusRegisterDetailBean> getCensusRegisterDetail(@Path("censusMsgId") String id, @Header("token") String token);
@GET("app/censusmsg/getcensusmsg")
Observable<CensusRegisterDetailBean> getCensusRegisterDetail(@Query("censusMsgId") String id, @Header("token") String token);
/**
* 户籍信息详情-身份证
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/censusmsg/hasmsg/{idCardNumber}")
Observable<CensusRegisterDetailBean> getCensusRegisterDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token);
@GET("app/censusmsg/getcensusmsg")
Observable<CensusRegisterDetailBean> getCensusRegisterDetailByIdCard(@Query("idCardNumber") String idCard, @Header("token") String token);
/**
* 编辑户籍信息
@ -400,7 +403,7 @@ public interface Apis {
* 保存人员户籍信息
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@POST("app/censusmsg/savecensusmsg")
@POST("app/censusmsg/save-census-msg")
Observable<SuccessBean> doSaveCensusRegister(@Body RequestBody body, @Header("token") String token);
@ -631,7 +634,7 @@ public interface Apis {
Observable<SuccessBean> doEditCrime(@Path("releaseAfterSentenceId") 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}")
@ -641,8 +644,8 @@ public interface Apis {
* 根据ID获取详情
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/releaseaftersentence/getreleaseaftersentencebyid/{releaseAfterSentenceId}")
Observable<CensusCrimeDetailBean> getCrimeDetailById(@Path("releaseAfterSentenceId") String id, @Header("token") String token);
@GET("app/releaseaftersentence/getreleaseaftersentenceinfo")
Observable<CensusCrimeDetailBean> getCrimeDetailById(@Query("releaseAfterSentenceId") String id, @Header("token") String token);
/**
* 根据身份证号码获取详情
@ -656,7 +659,7 @@ public interface Apis {
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/releaseaftersentence/listpagereleaseaftersentence")
Observable<CensusPersonBean> getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
Observable<CensusCriminalListBean> getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
/*===========================================肇事===========================================*/

105
commonmodule/src/main/res/layout/item_person_criminal.xml Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/shape_rectangle_white"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#ff353535"
android:textSize="18sp"
tools:text="姓名" />
<TextView
android:id="@+id/tv_id_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="12sp"
tools:text="身份证号码" />
<TextView
android:id="@+id/tv_charge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="12sp"
tools:text="原罪名:222" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/btn_del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="删除"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="编辑"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="5dp"
android:background="@drawable/shp_line_dotted"
android:layerType="software" />
<TextView
android:id="@+id/tv_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/ic_clock_blue"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="#ff1189ff"
android:textSize="12sp"
tools:text="释放日期:2022-20-12" />
</LinearLayout>

105
commonmodule/src/main/res/layout/item_person_register.xml Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/shape_rectangle_white"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#ff353535"
android:textSize="18sp"
tools:text="姓名" />
<TextView
android:id="@+id/tv_id_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="12sp"
tools:text="身份证号码" />
<TextView
android:id="@+id/tv_hand_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="12sp"
tools:text="户主" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/btn_del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="删除"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="编辑"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="5dp"
android:background="@drawable/shp_line_dotted"
android:layerType="software" />
<TextView
android:id="@+id/tv_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/ic_type_icon"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="#ff1189ff"
android:textSize="12sp"
tools:text="户号:202020" />
</LinearLayout>

17
gridmodule/src/main/AndroidManifest.xml
View File

@ -4,7 +4,7 @@
package="com.tengshisoft.gridmodule">
<application>
<activity android:name=".incident.activitys.patrols.ExpressPatrolEditActivity"></activity>
<activity android:name=".incident.activitys.patrols.ExpressPatrolEditActivity" />
<activity android:name=".incident.activitys.patrols.ExpressPatrolDetailActivity" />
<activity android:name=".incident.activitys.patrols.ExpressPatrolAddActivity" />
<activity android:name=".incident.activitys.patrols.ExpressPatrolListActivity" />
@ -51,6 +51,21 @@
<activity android:name=".incident.activitys.tasks.TaskDetailActivity" />
<activity android:name=".incident.activitys.tasks.TaskReportActivity" />
<activity android:name=".incident.activitys.tasks.TaskManageActivity" />
<activity
android:name=".incident.activitys.populace.special.CensusSpecialCriminalListActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden"
tools:ignore="LockedOrientationActivity" />
<activity
android:name=".incident.activitys.populace.special.CensusSpecialCriminalAddActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden"
tools:ignore="LockedOrientationActivity" />
<activity
android:name=".incident.activitys.populace.special.CensusSpecialCriminalDetailActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden"
tools:ignore="LockedOrientationActivity" />
<activity
android:name=".incident.activitys.populace.special.CensusCorrctListActivity"
android:screenOrientation="portrait"

9
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExpandableMainActivity.java
View File

@ -7,9 +7,12 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.tengshisoft.gridmodule.R;
import com.tengshisoft.gridmodule.R2;
import com.tengshisoft.gridmodule.incident.activitys.populace.special.CensusSpecialCriminalListActivity;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import java.nio.file.Path;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -53,11 +56,11 @@ public class CensusExpandableMainActivity extends BaseActivity {
mTvBaseTitle.setText("户籍人口");
refreshView(STATE_LOAD_SUCCESS);
mTvBase.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST));
// mTvBase.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusBaseActivity.class)));//基础信息
// mTvRegister.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusRegisterListActivity.class)));//户籍信息
mTvRegister.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_LIST));//户籍信息
mTvFloat.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//流动人员
mTvRear.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_LIST));//留守人员
// mTvCrime.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusSpecialCriminalListActivity.class)));//刑满释放
mTvCrime.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_LIST));//刑满释放
// mTvTrouble.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusTroubleListActivity.class)));//肇事
// mTvDrug.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusDrugListActivity.class)));//吸毒
// mTvCorrct.setOnClickListener(v -> startActivity(new Intent(mActivity, CensusCorrctListActivity.class)));//社区矫正

79
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java
View File

@ -56,8 +56,8 @@ import okhttp3.RequestBody;
public class CensusRegisterAddActivity extends BaseActivity {
@BindView(R2.id.ll_into_content)
LinearLayout mLlContent;
@BindView(R2.id.sw_accord)
Switch mSwAccord;//人户一致 * 01 一致 02 不一致
@BindView(R2.id.tv_accord)
TextView mTvAccord;//人户是否一致
@BindView(R2.id.et_house_number)
EditText mEtHouseNumber;//户号 *
@BindView(R2.id.et_id_card)
@ -93,10 +93,15 @@ public class CensusRegisterAddActivity extends BaseActivity {
@BindView(R2.id.tv_base_cur_loc)
TextView mTvBaseCurLoc;
private Unbinder mBind;
private boolean isAccord = false;//人户一致标识
private OptionsPickerView<DicBean> mRelationPicker;
private List<DicBean> mRelationList;
private String mSelRelation;
private OptionsPickerView<DicBean> mAccordPicker;
private List<DicBean> mAccordList;
private DicBean mSelAccord;
private PersonSearchBean mBaseInfoBean;
private String mId;
@ -108,8 +113,6 @@ public class CensusRegisterAddActivity extends BaseActivity {
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mLlContent.setVisibility(View.INVISIBLE);
//主键
mId = getIntent().getStringExtra("id");
@ -127,11 +130,35 @@ public class CensusRegisterAddActivity extends BaseActivity {
mTvBaseTitle.setText(title);
mBtnSearch.setOnClickListener(v -> doSearchPerson());
mIvClear.setOnClickListener(v -> mEtSearchIdCard.setText(""));
mSwAccord.setOnCheckedChangeListener((buttonView, isChecked) -> isAccord = isChecked);
mTvRelation.setOnClickListener(v -> onShowRelation());
mTvAccord.setOnClickListener(v -> onShowAccord());
mBtnConfirm.setOnClickListener(v -> doSubmit());
}
/**
* 人户是否一致
*/
private void onShowAccord() {
hideSoftKeyboard();
if (mAccordList != null && mAccordList.size() > 0) {
if (mAccordPicker == null) {
mAccordPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
mSelAccord = mAccordList.get(o1);
mTvAccord.setText(mSelAccord.getDataName());
})
.setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mAccordPicker.setPicker(mAccordList);
}
mAccordPicker.show();
} else {
getDicListByType(PathConfig.DIC_ACCORD, 4);
}
}
/**
* 获取详情
*
@ -171,14 +198,16 @@ public class CensusRegisterAddActivity extends BaseActivity {
*/
private void setDataToView(CensusRegisterDetailBean bean, int type) {
mId = bean.getCensusMsgId();
isAccord = bean.getPeopleSameCensus().equals("一致");//人户一致标识
mSelAccord = new DicBean();
mSelAccord.setDataId(bean.getPeopleSameCensus());
mSelAccord.setDataName(bean.getPeopleSameCensusDict());
mTvAccord.setText(bean.getPeopleSameCensusDict());
mSelRelation = bean.getRelationshipWithHouseholder();
mSwAccord.setChecked(isAccord);
mEtPhone.setText(bean.getContact());
mEtHouseNumber.setText(bean.getCensusNumber());
mEtHouseName.setText(bean.getNameOfHouseholder());
mEtIdCard.setText(bean.getIdCardOfHouseholder());
mTvRelation.setText(bean.getRelationshipWithHouseholder());
mTvRelation.setText(bean.getRelationshipWithHouseholderDict());
if (type == 0) {
mEtSearchIdCard.setText(bean.getIdCardNumber());
doSearchPerson();
@ -323,13 +352,11 @@ public class CensusRegisterAddActivity extends BaseActivity {
private RequestBody buildParams() {
CensusmsgBean bean = new CensusmsgBean();
bean.setBaseId(mBaseInfoBean.getBasePopulationInfoId());
//人户一致
if (isAccord) {
bean.setPeopleSameCensus("一致");
} else {
bean.setPeopleSameCensus("不一致");
}
bean.setFullName(mBaseInfoBean.getFullName());
bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber());
bean.setPeopleSameCensus(mSelAccord.getDataId());
//户号
String houseNumber = mEtHouseNumber.getText().toString().trim();
bean.setCensusNumber(houseNumber);
@ -382,6 +409,10 @@ public class CensusRegisterAddActivity extends BaseActivity {
mRelationList = typeListBeans;
onShowRelation();
break;
case 4:
mAccordList = typeListBeans;
onShowAccord();
break;
}
} else {
ToastUtils.show("暂无数据");
@ -402,6 +433,9 @@ public class CensusRegisterAddActivity extends BaseActivity {
}
/**
* 搜索基础信息与户籍信息
*/
private void doSearchPerson() {
String searchIdCard = mEtSearchIdCard.getText().toString().trim();
if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) {
@ -411,7 +445,9 @@ public class CensusRegisterAddActivity extends BaseActivity {
hideSoftKeyboard();
ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中...");
dialog.show();
Observable<CensusRegisterDetailBean> detailBeanObservable = RetrofitManager.getInstance().create(Apis.class).getCensusRegisterDetailByIdCard(searchIdCard, UserLgUtils.getToken());
Observable<CensusRegisterDetailBean> detailBeanObservable = RetrofitManager.getInstance()
.create(Apis.class)
.getCensusRegisterDetailByIdCard(searchIdCard, UserLgUtils.getToken());
Observable<PersonSearchBean> infoBean = RetrofitManager.getInstance()
.create(BaseApiService.class)
.doSearchPerson(searchIdCard, UserLgUtils.getToken());
@ -470,12 +506,11 @@ public class CensusRegisterAddActivity extends BaseActivity {
* 初始化页面
*/
private void setDefault() {
isAccord = false;//人户一致标识
mRelationList = null;
mSelAccord = null;
mAccordList = null;
mSelRelation = "";
mBaseInfoBean = null;
mSwAccord.setChecked(isAccord);
mEtPhone.setText("");
mEtHouseNumber.setText("");
mEtHouseName.setText("");
@ -490,10 +525,10 @@ public class CensusRegisterAddActivity extends BaseActivity {
mBaseInfoBean = o;
mLlContent.setVisibility(View.VISIBLE);
mTvBaseName.setText(o.getFullName());
mTvBaseGender.setText(o.getGender());
mTvBaseGender.setText(o.getGenderDictionaryName());
mTvBasePhone.setText(o.getTelephone());
mTvBaseNative.setText(o.getNativePlace());
mTvBaseCurLoc.setText(o.getCurrentResidence());
mTvBaseNative.setText(o.getNativePlaceDictionaryName());
mTvBaseCurLoc.setText(o.getCurrentResidenceDictionaryName());
}

18
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterDetailActivity.java
View File

@ -56,8 +56,8 @@ public class CensusRegisterDetailActivity extends BaseActivity {
@BindView(R2.id.tv_base_cur_address)
TextView mTvBaseCurAddress;//现住址详情
//户籍信息
@BindView(R2.id.sw_accord)
Switch mSwAccord;//人户一致
@BindView(R2.id.tv_accord)
TextView mTvAccord;
@BindView(R2.id.tv_house_number)
TextView mTvHouseNumber;//户号
@BindView(R2.id.tv_id_card)
@ -138,13 +138,13 @@ public class CensusRegisterDetailActivity extends BaseActivity {
private void setBaseInfo() {
mTvBaseName.setText(mBaseInfo.getFullName());
mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore());
mTvBaseGender.setText(mBaseInfo.getGender());
mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName());
mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证
mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话
mTvBaseNative.setText(mBaseInfo.getNativePlace());//籍贯
mTvBaseNation.setText(mBaseInfo.getNation());//名族
mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidence());//户籍地
mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidence());//现住址
mTvBaseNative.setText(mBaseInfo.getNativePlaceDictionaryName());//籍贯
mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族
mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidenceDictionaryName());//户籍地
mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidenceDictionaryName());//现住址
mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情
}
@ -152,11 +152,11 @@ public class CensusRegisterDetailActivity extends BaseActivity {
* 户籍信息
*/
private void setRegisterInfo() {
mSwAccord.setChecked(mRegisterDetailBean.getPeopleSameCensus().equals("一致"));//人户一致
mTvAccord.setText(mRegisterDetailBean.getPeopleSameCensusDict());
mTvHouseNumber.setText(mRegisterDetailBean.getCensusNumber());//户号
mTvIdCard.setText(mRegisterDetailBean.getIdCardNumber());//户主身份证号
mTvHouseName.setText(mRegisterDetailBean.getNameOfHouseholder());//户主名
mTvRelation.setText(mRegisterDetailBean.getRelationshipWithHouseholder());//与户主关系
mTvRelation.setText(mRegisterDetailBean.getRelationshipWithHouseholderDict());//与户主关系
mTvPhone.setText(mRegisterDetailBean.getContact());//户主联系电话
}

24
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java
View File

@ -14,7 +14,9 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.hjq.toast.ToastUtils;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter;
import com.tengshisoft.commonmodule.adapters.CensusRegisterAdapter;
import com.tengshisoft.commonmodule.beans.CensusPersonBean;
import com.tengshisoft.commonmodule.beans.CensusRegisterListBean;
import com.tengshisoft.commonmodule.beans.SuccessBean;
import com.tengshisoft.commonmodule.nets.Apis;
import com.tengshisoft.gridmodule.R;
@ -58,8 +60,8 @@ public class CensusRegisterListActivity extends BaseActivity {
private Unbinder mBind;
private String mRows = "20";
private int mCurPage = 1;
private CensusPersonAdapter mAdapter;
private List<CensusPersonBean.RowsBean> mDatas = new ArrayList<>();
private CensusRegisterAdapter mAdapter;
private List<CensusRegisterListBean.RowsBean> mDatas = new ArrayList<>();
private Disposable mDisposable;
private String mKeywords = "";
@ -87,7 +89,7 @@ public class CensusRegisterListActivity extends BaseActivity {
mEtSearchContent.setText("");
refreshData();
});
mAdapter = new CensusPersonAdapter(mActivity, mDatas);
mAdapter = new CensusRegisterAdapter(mActivity, mDatas);
LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mRlvContent.setLayoutManager(layoutManager);
@ -95,14 +97,14 @@ public class CensusRegisterListActivity extends BaseActivity {
mAdapter.addOnItemClickListener(this::showDetail);
mSrlContent.setOnLoadMoreListener(refreshLayout -> getUpcomingList(mCurPage));
mSrlContent.setOnRefreshListener(refreshLayout -> refreshData());
mAdapter.addOnEditListener(new CensusPersonAdapter.OnEditListener() {
mAdapter.addOnEditListener(new CensusRegisterAdapter.OnEditListener() {
@Override
public void onDel(CensusPersonBean.RowsBean bean, int pos) {
public void onDel(CensusRegisterListBean.RowsBean bean, int pos) {
doDelBean(bean, pos);
}
@Override
public void onEdit(CensusPersonBean.RowsBean bean, int pos) {
public void onEdit(CensusRegisterListBean.RowsBean bean, int pos) {
doEditBean(bean, pos);
}
});
@ -129,7 +131,7 @@ public class CensusRegisterListActivity extends BaseActivity {
* @param bean
* @param pos
*/
private void doDelBean(CensusPersonBean.RowsBean bean, int pos) {
private void doDelBean(CensusRegisterListBean.RowsBean bean, int pos) {
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
builder.setTitle("提示")
.setMessage("确定要删除该条信息吗?")
@ -179,7 +181,7 @@ public class CensusRegisterListActivity extends BaseActivity {
* @param bean
* @param pos
*/
private void doEditBean(CensusPersonBean.RowsBean bean, int pos) {
private void doEditBean(CensusRegisterListBean.RowsBean bean, int pos) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_ADD)
.withString("title", "户籍信息编辑")
@ -192,7 +194,7 @@ public class CensusRegisterListActivity extends BaseActivity {
*
* @param bean
*/
private void showDetail(CensusPersonBean.RowsBean bean) {
private void showDetail(CensusRegisterListBean.RowsBean bean) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_DETAIL)
.withString("id", bean.getCensusMsgId())
@ -220,14 +222,14 @@ public class CensusRegisterListActivity extends BaseActivity {
.getCensusRegister(page + "", mKeywords, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CensusPersonBean>() {
.subscribe(new Observer<CensusRegisterListBean>() {
@Override
public void onSubscribe(Disposable d) {
mListDis = d;
}
@Override
public void onNext(CensusPersonBean leaveListBean) {
public void onNext(CensusRegisterListBean leaveListBean) {
if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) {
++mCurPage;
if (page == 1) {

89
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java
View File

@ -358,35 +358,6 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
}
/**
* 获取本地字典
*/
// private void getDicListLoc(String fileName, int type) {
// List<DicBean> 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 doSubmit() {
if (checkParams()) {
if (!TextUtils.isEmpty(mId)) {
@ -476,6 +447,7 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
private RequestBody buildParams() {
SaveCrimeBean bean = new SaveCrimeBean();
bean.setFullName(mBaseInfoBean.getFullName());
bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber());
bean.setIsCumulativeCrime(mIsCrime ? "1" : "0");
String charge = mTvCharge.getText().toString().trim();//请选择原罪名
@ -609,45 +581,32 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
hideSoftKeyboard();
ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中...");
dialog.show();
Observable<CensusCrimeDetailBean> detailBeanObservable = RetrofitManager.getInstance().create(Apis.class).getCrimeDetailByIdCard(searchIdCard, UserLgUtils.getToken());
Observable<PersonSearchBean> infoBean = RetrofitManager.getInstance()
RetrofitManager.getInstance()
.create(BaseApiService.class)
.doSearchPerson(searchIdCard, UserLgUtils.getToken());
Observable.merge(detailBeanObservable, infoBean)
.doSearchPerson(searchIdCard, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Object>() {
.subscribe(new Observer<PersonSearchBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Object o) {
if (o instanceof PersonSearchBean) {
PersonSearchBean infoBean1 = (PersonSearchBean) o;
if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) {
//设置基础信息
setBaseInfo(infoBean1);
} else {
ToastUtils.show("未查询到改人员的基础信息,请完善基础信息");
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);
}
public void onNext(@NonNull PersonSearchBean personSearchBean) {
dialog.dismiss();
if (!TextUtils.isEmpty(personSearchBean.getIdCardNumber())) {
//设置基础信息
setBaseInfo(personSearchBean);
} else {
ToastUtils.show("未查询到改人员的基础信息,请完善基础信息");
mTvBaseName.setText("");
mTvBaseGender.setText("");
mTvBasePhone.setText("");
mTvBaseNative.setText("");
mTvBaseCurLoc.setText("");
mLlContent.setVisibility(View.GONE);
}
}
@Override
@ -671,18 +630,18 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
mId = bean.getReleaseAfterSentenceId();
mIsCrime = bean.getIsCumulativeCrime().equals("1");
mSwCrime.setChecked(mIsCrime);//是否累犯
mTvCharge.setText(bean.getNameOfOriginalSinDictionaryName());//原罪名
mTvCharge.setText(bean.getNameOfOriginalSinDict());//原罪名
mSelcharge = bean.getNameOfOriginalSin();
mEtPrisonTerm.setText(bean.getOriginalSentenceData());//原判刑期
mEtPrisonPlace.setText(bean.getServingSentencePlace());//服刑场所
mTvReleaseDate.setText(bean.getReleaseDate());//释放日期
mTvAssess.setText(bean.getAssessmentRiskTypeDictionaryName());//危险评估
mTvAssess.setText(bean.getAssessmentRiskTypeDict());//危险评估
mSelAssess = bean.getAssessmentRiskType();
mTvJoinDate.setText(bean.getLinkUpDate());//衔接日期
mTvJoinCase.setText(bean.getLinkUpSituationDictionaryName());//衔接情况
mTvJoinCase.setText(bean.getLinkUpSituationDict());//衔接情况
mSelJoinCase = bean.getLinkUpSituation();
mTvPutDate.setText(bean.getPlacementDate());//安置日期
mTvPutCase.setText(bean.getPlacementSituationDictionaryName());//安置情况
mTvPutCase.setText(bean.getPlacementSituationDict());//安置情况
mPutCase = bean.getPlacementSituation();
mEtUnputCase.setText(bean.getUnPlacementReason());//未安置原因
mTvHelpCase.setText(bean.getHelpAndEducate());//帮扶情况
@ -704,10 +663,10 @@ public class CensusSpecialCriminalAddActivity extends BaseActivity {
mBaseInfoBean = o;
mLlContent.setVisibility(View.VISIBLE);
mTvBaseName.setText(o.getFullName());
mTvBaseGender.setText(o.getGender());
mTvBaseGender.setText(o.getGenderDictionaryName());
mTvBasePhone.setText(o.getTelephone());
mTvBaseNative.setText(o.getNativePlace());
mTvBaseCurLoc.setText(o.getCurrentResidence());
mTvBaseNative.setText(o.getNativePlaceDictionaryName());
mTvBaseCurLoc.setText(o.getCurrentResidenceDictionaryName());
}

20
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCrimianlDetailActivity.java → gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalDetailActivity.java
View File

@ -34,7 +34,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
* 描述: 罪犯人员详情
*/
@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_DETAIl)
public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
public class CensusSpecialCriminalDetailActivity extends BaseActivity {
//基础信息
@BindView(R2.id.tv_base_name)
@ -155,13 +155,13 @@ public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
private void setBaseInfo() {
mTvBaseName.setText(mBaseInfo.getFullName());
mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore());
mTvBaseGender.setText(mBaseInfo.getGender());
mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName());
mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证
mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话
mTvBaseNative.setText(mBaseInfo.getNativePlace());//籍贯
mTvBaseNation.setText(mBaseInfo.getNation());//名族
mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidence());//户籍地
mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidence());//现住址
mTvBaseNative.setText(mBaseInfo.getNativePlaceDictionaryName());//籍贯
mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族
mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidenceDictionaryName());//户籍地
mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidenceDictionaryName());//现住址
mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情
}
@ -170,15 +170,15 @@ public class CensusSpecialCrimianlDetailActivity extends BaseActivity {
*/
private void setDataToView() {
mSwCrime.setChecked(mDetailBean.getIsCumulativeCrime().equals("1"));//是否累犯
mTvCharge.setText(mDetailBean.getNameOfOriginalSinDictionaryName());//原罪名
mTvCharge.setText(mDetailBean.getNameOfOriginalSinDict());//原罪名
mEtPrisonTerm.setText(mDetailBean.getOriginalSentenceData());//原判刑期
mEtPrisonPlace.setText(mDetailBean.getServingSentencePlace());//服刑场所
mTvReleaseDate.setText(mDetailBean.getReleaseDate());//释放日期
mTvAssess.setText(mDetailBean.getAssessmentRiskTypeDictionaryName());//危险评估
mTvAssess.setText(mDetailBean.getAssessmentRiskTypeDict());//危险评估
mTvJoinDate.setText(mDetailBean.getLinkUpDate());//衔接日期
mTvJoinCase.setText(mDetailBean.getLinkUpSituationDictionaryName());//衔接情况
mTvJoinCase.setText(mDetailBean.getLinkUpSituationDict());//衔接情况
mTvPutDate.setText(mDetailBean.getPlacementDate());//安置日期
mTvPutCase.setText(mDetailBean.getPlacementSituationDictionaryName());//安置情况
mTvPutCase.setText(mDetailBean.getPlacementSituationDict());//安置情况
mEtUnputCase.setText(mDetailBean.getUnPlacementReason());//未安置原因
mTvHelpCase.setText(mDetailBean.getHelpAndEducate());//帮扶情况
mSwIsRecirme.setChecked(mDetailBean.getIsCrimeAgain().equals("1"));//是否重新犯罪

24
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java
View File

@ -12,7 +12,9 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.hjq.toast.ToastUtils;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.CensusCriminalAdapter;
import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter;
import com.tengshisoft.commonmodule.beans.CensusCriminalListBean;
import com.tengshisoft.commonmodule.beans.CensusPersonBean;
import com.tengshisoft.commonmodule.beans.SuccessBean;
import com.tengshisoft.commonmodule.nets.Apis;
@ -57,8 +59,8 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
private Unbinder mBind;
private String mRows = "20";
private int mCurPage = 1;
private CensusPersonAdapter mAdapter;
private List<CensusPersonBean.RowsBean> mDatas = new ArrayList<>();
private CensusCriminalAdapter mAdapter;
private List<CensusCriminalListBean.RowsBean> mDatas = new ArrayList<>();
private Disposable mDisposable;
private String mKeywords = "";
@ -86,7 +88,7 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
mEtSearchContent.setText("");
refreshData();
});
mAdapter = new CensusPersonAdapter(mActivity, mDatas);
mAdapter = new CensusCriminalAdapter(mActivity, mDatas);
LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mRlvContent.setLayoutManager(layoutManager);
@ -95,14 +97,14 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
mSrlContent.setOnLoadMoreListener(v -> getUpcomingList(mCurPage));
mSrlContent.setOnRefreshListener(v -> refreshData());
mAdapter.addOnEditListener(new CensusPersonAdapter.OnEditListener() {
mAdapter.addOnEditListener(new CensusCriminalAdapter.OnEditListener() {
@Override
public void onDel(CensusPersonBean.RowsBean bean, int pos) {
public void onDel(CensusCriminalListBean.RowsBean bean, int pos) {
doDelBean(bean, pos);
}
@Override
public void onEdit(CensusPersonBean.RowsBean bean, int pos) {
public void onEdit(CensusCriminalListBean.RowsBean bean, int pos) {
doEditBean(bean, pos);
}
});
@ -129,7 +131,7 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
* @param bean
* @param pos
*/
private void doDelBean(CensusPersonBean.RowsBean bean, int pos) {
private void doDelBean(CensusCriminalListBean.RowsBean bean, int pos) {
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
builder.setTitle("提示")
.setMessage("确定要删除该条信息吗?")
@ -179,7 +181,7 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
* @param bean
* @param pos
*/
private void doEditBean(CensusPersonBean.RowsBean bean, int pos) {
private void doEditBean(CensusCriminalListBean.RowsBean bean, int pos) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_ADD)
.withString("title", "刑满释放人员信息编辑")
@ -192,7 +194,7 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
*
* @param bean
*/
private void showDetail(CensusPersonBean.RowsBean bean) {
private void showDetail(CensusCriminalListBean.RowsBean bean) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_DETAIl)
.withString("id", bean.getReleaseAfterSentenceId())
@ -220,14 +222,14 @@ public class CensusSpecialCriminalListActivity extends BaseActivity {
.getCrimeList(page + "", mKeywords, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CensusPersonBean>() {
.subscribe(new Observer<CensusCriminalListBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(CensusPersonBean leaveListBean) {
public void onNext(CensusCriminalListBean leaveListBean) {
if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) {
++mCurPage;
if (page == 1) {

23
gridmodule/src/main/res/layout/activity_census_register_add.xml
View File

@ -23,12 +23,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_issue_base_info"
style="@style/issue_report_title"
android:padding="8dp"
android:text="户籍信息"
android:textStyle="bold" />
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
@ -43,6 +37,13 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_issue_base_info"
style="@style/issue_report_title"
android:padding="8dp"
android:text="户籍信息"
android:textStyle="bold" />
<LinearLayout style="@style/item_gray">
<ImageView style="@style/style_hint_star" />
@ -54,9 +55,10 @@
<View style="@style/vertical_line" />
<Switch
android:id="@+id/sw_accord"
style="@style/item_switch" />
<TextView
android:id="@+id/tv_accord"
style="@style/sel_text_arrow"
android:hint="请选择人户是否一致" />
</LinearLayout>
<LinearLayout style="@style/item_gray">
@ -139,8 +141,7 @@
<TextView
style="@style/item_title"
android:text="户主联系方式"
android:textSize="11sp" />
android:text="户主联系方式" />
<View style="@style/vertical_line" />

11
gridmodule/src/main/res/layout/activity_census_register_detail.xml
View File

@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -50,10 +49,10 @@
<View style="@style/vertical_line" />
<Switch
android:id="@+id/sw_accord"
style="@style/item_switch"
android:enabled="false" />
<TextView
android:id="@+id/tv_accord"
style="@style/sel_text_show"
android:hint="未录入" />
</LinearLayout>
<LinearLayout style="@style/item_gray">

3
gridmodule/src/main/res/layout/activity_census_register_list.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/gray_bg">
<include layout="@layout/item_search" />

3
gridmodule/src/main/res/layout/activity_census_special_criminal_list.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/gray_bg">
<include layout="@layout/item_search" />