From 64eddab2a768c176063fe58378f12b16f2317fe5 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Tue, 6 Jun 2023 18:48:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 4 +- .../baselib/core/beans/PersonSearchBean.java | 66 ++- .../baselib/core/retrofit_net/BaseUrlApi.java | 1 + .../core/widget/base/BaseActivity.java | 15 + .../widget/views/CenterGridPhoneListView.java | 202 +++++++ .../core/widget/views/GridTextAdapter.java | 31 + .../core/widget/views/GridTextViewHolder.java | 22 + .../main/res/layout/dialog_base_grid_list.xml | 26 + .../src/main/res/layout/item_grid_phone.xml | 36 ++ .../res/layout/layout_base_info_detail.xml | 2 +- build.gradle | 7 +- .../adapters/ConditionAreaGridAdapter.java | 56 ++ .../commonmodule/beans/AreaGridListBean.java | 9 +- .../commonmodule/nets/GridApis.java | 561 ++++++++++++------ .../views/ConditionAreaGridPopup.java | 84 +++ .../res/drawable-xhdpi/ic_arrow_sort_gray.png | Bin 0 -> 211 bytes .../populace/CensusBaseActivity.java | 105 +++- .../populace/CensusBaseDetailActivity.java | 168 ++++-- .../populace/CensusBaseEnterActivity.java | 9 +- .../populace/CensusBaseSearchActivity.java | 357 +++++++++-- .../populace/CensusExitrActivity.java | 102 +++- .../populace/CensusResidsActivity.java | 104 +++- .../populace/CensusYoungListActivity.java | 4 +- .../populace/YoungCaseListActivity.java | 2 + .../normal/CensusMigrantListActivity.java | 2 + .../normal/CensusRearListActivity.java | 2 + .../normal/CensusRegisterListActivity.java | 2 + .../outbound/CensusOutboundListActivity.java | 2 + .../special/CensusAidsListActivity.java | 2 + .../special/CensusCorrctListActivity.java | 2 + .../special/CensusDrugListActivity.java | 2 + .../CensusSpecialCriminalListActivity.java | 2 + .../special/CensusTroubleListActivity.java | 2 + .../main/res/layout/activity_census_base.xml | 122 ++-- .../layout/activity_census_base_detail.xml | 2 +- .../res/layout/activity_census_base_exitr.xml | 120 ++-- .../layout/activity_census_base_resids.xml | 120 ++-- .../layout/activity_census_base_search.xml | 180 ++++-- .../layout/activity_census_corrct_list.xml | 2 +- .../res/layout/activity_census_drug_list.xml | 2 +- .../main/res/layout/activity_census_enter.xml | 2 +- .../layout/activity_census_nmigrant_list.xml | 2 +- .../layout/activity_census_register_list.xml | 2 +- .../activity_census_resr_person_list.xml | 2 +- .../activity_census_special_criminal_list.xml | 2 +- .../layout/activity_census_trouble_list.xml | 2 +- .../layout/activity_penal_suspicion_add.xml | 2 +- .../layout/activity_penal_suspicion_edit.xml | 2 +- .../res/layout/activity_penal_victim_add.xml | 2 +- .../res/layout/activity_penal_victim_edit.xml | 2 +- 50 files changed, 2059 insertions(+), 500 deletions(-) create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java create mode 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextAdapter.java create mode 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextViewHolder.java create mode 100755 baselib/src/main/res/layout/dialog_base_grid_list.xml create mode 100644 baselib/src/main/res/layout/item_grid_phone.xml create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/ConditionAreaGridAdapter.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java create mode 100644 commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 26ee60b..1e39ec4 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 12, - "versionName": "1.1.1", + "versionCode": 13, + "versionName": "1.1.2", "outputFile": "app-release.apk" } ] diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java index 2ec4f2f..cb7f263 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java @@ -1,5 +1,7 @@ package com.tenlionsoft.baselib.core.beans; +import java.util.List; + /** * 作者: adam * 日期: 2021/7/12 - 4:17 下午 @@ -23,6 +25,7 @@ public class PersonSearchBean { private String genderDictionaryName; private String gridId; private String gridName; + private List gridPersonList; private String idCardNumber; private String maritalStatus; private String maritalStatusDictionaryName; @@ -43,17 +46,10 @@ public class PersonSearchBean { private String religion; private String religionDictionaryName; private String serviceSpace; + private String subtype; private String telephone; private String type; - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getAreaCode() { return areaCode; } @@ -174,6 +170,14 @@ public class PersonSearchBean { this.gridName = gridName; } + public List getGridPersonList() { + return gridPersonList; + } + + public void setGridPersonList(List gridPersonList) { + this.gridPersonList = gridPersonList; + } + public String getIdCardNumber() { return idCardNumber; } @@ -334,6 +338,14 @@ public class PersonSearchBean { this.serviceSpace = serviceSpace; } + public String getSubtype() { + return subtype; + } + + public void setSubtype(String subtype) { + this.subtype = subtype; + } + public String getTelephone() { return telephone; } @@ -341,4 +353,42 @@ public class PersonSearchBean { public void setTelephone(String telephone) { this.telephone = telephone; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public static class GridPersonListBean { + private String gridUserId; + private String gridUserName; + private String gridUserPhone; + + public String getGridUserId() { + return gridUserId; + } + + public void setGridUserId(String gridUserId) { + this.gridUserId = gridUserId; + } + + public String getGridUserName() { + return gridUserName; + } + + public void setGridUserName(String gridUserName) { + this.gridUserName = gridUserName; + } + + public String getGridUserPhone() { + return gridUserPhone; + } + + public void setGridUserPhone(String gridUserPhone) { + this.gridUserPhone = gridUserPhone; + } + } } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 093d85e..c911ca3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -28,6 +28,7 @@ public class BaseUrlApi { public static final String BASE_LIBRARY_IP = IP + SYS_LIBRARY; public static final String BASE_TASK_IP = IP + SYS_TASK; public static final String BASE_PERSON_IP = IP + SYS_POPULATION; +// public static final String BASE_PERSON_IP = "http://192.168.0.115:8080/" + SYS_POPULATION;//TODO 测试 public static final String BASE_HOUSE_IP = IP + SYS_HOUSE; public static final String BASE_SECURITY_IP = IP + SYS_SECURITY; public static final String BASE_VISITS_IP = IP + SYS_VISITS; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java index 5cda271..15a22fc 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java @@ -23,12 +23,14 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.util.DisplayMetrics; import android.view.Display; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.TouchDelegate; import android.view.View; import android.view.WindowManager; import android.view.animation.LinearInterpolator; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.webkit.WebView; import android.widget.Button; @@ -293,6 +295,19 @@ public abstract class BaseActivity extends AppCompatActivity { } } }); + mEtAppSearchContent.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + hideSoftKeyboard(); + mEtAppSearchContent.clearFocus(); + doSearchByTitle(); + return true; + } else { + return false; + } + } + }); mIvClearSearch.setOnClickListener(v -> clearSearchContent()); //设置默认title mIvAppSearchIcon.setVisibility(View.GONE); diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java new file mode 100755 index 0000000..5f653d7 --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java @@ -0,0 +1,202 @@ +package com.tenlionsoft.baselib.core.widget.views; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; +import android.content.Intent; +import android.graphics.drawable.ColorDrawable; +import android.net.Uri; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.DisplayMetrics; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bigkoo.pickerview.view.TimePickerView; +import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.R; +import com.tenlionsoft.baselib.core.beans.PersonSearchBean; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + + +/** + * 作者 : Adam on 2018/7/23. + * 邮箱 : itgaojian@163.com + * 描述 : 时间加输入 + */ +public class CenterGridPhoneListView extends Dialog { + + private boolean iscancelable; + private boolean isBackCancelable; + private View view; + private Context context; + private int gravity; + private OnChoseListener mListener; + private boolean mIsShow; + private boolean mIsShowOther; + private TimePickerView mTimePicker; + private EditText mEtContent; + private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private List mGridList = new ArrayList<>(); + + private CenterGridPhoneListView(Context context, boolean isCancelable, boolean isBackCancelable, int gravity, + boolean isShow, boolean isShowOther, List gridList) { + super(context, R.style.dialog_center_alpha); + this.context = context; + this.gravity = gravity; + this.iscancelable = isCancelable; + this.isBackCancelable = isBackCancelable; + this.mIsShow = isShow; + this.mIsShowOther = isShowOther; + this.mGridList = gridList; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + view = LayoutInflater.from(context).inflate(R.layout.dialog_base_grid_list, null); + setContentView(view); + setCancelable(true); + setCanceledOnTouchOutside(true); + RecyclerView mRlvGrid = view.findViewById(R.id.rlv_grids); + GridTextAdapter adapter = new GridTextAdapter(context, mGridList); + mRlvGrid.setLayoutManager(new LinearLayoutManager(context)); + mRlvGrid.setAdapter(adapter); + adapter.addOnItemClickListener(gridPersonListBean -> { + if (!TextUtils.isEmpty(gridPersonListBean.getGridUserPhone())) { + this.dismiss(); + doCall(gridPersonListBean.getGridUserPhone()); + } + }); + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + Window window = this.getWindow(); + window.setGravity(Gravity.CENTER); + window.setWindowAnimations(R.style.dialog_center_alpha); + WindowManager.LayoutParams params = window.getAttributes(); + params.width = (int) (displayMetrics.widthPixels * 0.9); + params.height = WindowManager.LayoutParams.WRAP_CONTENT; + window.setAttributes(params); + window.setBackgroundDrawable(new ColorDrawable()); + } + + public void HideSoftKeyBoardDialog(Activity activity) { + try { + InputMethodManager imm = (InputMethodManager) activity.getSystemService(activity.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(mEtContent.getWindowToken(), 0); + } catch (Exception ex) { + + + } + } + + private void doCall(String gridUserPhone) { + if (!TextUtils.isEmpty(gridUserPhone)) { + Intent intent = new Intent(Intent.ACTION_DIAL); + Uri data = Uri.parse("tel:" + gridUserPhone); + intent.setData(data); + context.startActivity(intent); + } + } + + private void doConfirm() { + if (checkParams()) { + String time = ""; + String content = mEtContent.getText().toString().trim(); + mListener.doConfirm(time, content); + } + } + + /** + * 校验参数 + */ + private boolean checkParams() { + String content = mEtContent.getText().toString().trim(); + if (TextUtils.isEmpty(content)) { + ToastUtils.show("请输入原由"); + return false; + } + return true; + } + + + public void addOnChoseListener(OnChoseListener listener) { + this.mListener = listener; + } + + /** + * 选择 + * + * @param i + */ + private void choseType(int i) { + this.dismiss(); + } + + public interface OnChoseListener { + void doConfirm(String list, String ids); + } + + public static class DialogBuilder { + private Context mContext; + private boolean isCancelable; + private boolean mIsBackable; + private int mGravity = Gravity.BOTTOM; + private OnChoseListener mListener; + private boolean mIsShowOther; + + public DialogBuilder(Context context) { + this.mContext = context; + } + + public DialogBuilder setIscancelable(boolean iscancelable) { + this.isCancelable = iscancelable; + return this; + } + + public DialogBuilder setIsBackCancelable(boolean isBackCancelable) { + this.mIsBackable = isBackCancelable; + return this; + } + + public DialogBuilder setShowLocation(int gravity) { + this.mGravity = gravity; + return this; + } + + private boolean mIsShow; + + public DialogBuilder setIsShowFile(boolean isShowFile) { + mIsShow = isShowFile; + return this; + } + + public DialogBuilder setIsShowOther(boolean isShow) { + mIsShowOther = isShow; + return this; + } + + private List mList; + + public DialogBuilder setList(List list) { + this.mList = list; + return this; + } + + public CenterGridPhoneListView build() { + return new CenterGridPhoneListView(this.mContext, this.isCancelable, this.mIsBackable, this.mGravity, + mIsShow, mIsShowOther, mList); + } + } +} \ No newline at end of file diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextAdapter.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextAdapter.java new file mode 100644 index 0000000..df1ea7c --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextAdapter.java @@ -0,0 +1,31 @@ +package com.tenlionsoft.baselib.core.widget.views; + +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.tenlionsoft.baselib.R; +import com.tenlionsoft.baselib.core.beans.PersonSearchBean; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; + +import java.util.List; + +public class GridTextAdapter extends BaseRecyclerAdapter { + public GridTextAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public GridTextViewHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_grid_phone, parent, false); + return new GridTextViewHolder(itemView); + } + + @Override + public void bindHolder(GridTextViewHolder gridTextViewHolder, int i) { + gridTextViewHolder.mTvName.setText(mData.get(i).getGridUserName()); + gridTextViewHolder.mTvPhone.setText(TextUtils.isEmpty(mData.get(i).getGridUserPhone())?"未录入":mData.get(i).getGridUserPhone()); + } +} diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextViewHolder.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextViewHolder.java new file mode 100644 index 0000000..123e20e --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/GridTextViewHolder.java @@ -0,0 +1,22 @@ +package com.tenlionsoft.baselib.core.widget.views; + +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.tenlionsoft.baselib.R; + +public class GridTextViewHolder extends RecyclerView.ViewHolder { + public TextView mTvName; + public TextView mTvPhone; + public LinearLayout mLlGrid; + public GridTextViewHolder(@NonNull View itemView) { + super(itemView); + mTvName=itemView.findViewById(R.id.tv_name); + mTvPhone= itemView.findViewById(R.id.tv_phone); + mLlGrid=itemView.findViewById(R.id.ll_grid); + } +} diff --git a/baselib/src/main/res/layout/dialog_base_grid_list.xml b/baselib/src/main/res/layout/dialog_base_grid_list.xml new file mode 100755 index 0000000..0b01ca1 --- /dev/null +++ b/baselib/src/main/res/layout/dialog_base_grid_list.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/item_grid_phone.xml b/baselib/src/main/res/layout/item_grid_phone.xml new file mode 100644 index 0000000..1e90c9a --- /dev/null +++ b/baselib/src/main/res/layout/item_grid_phone.xml @@ -0,0 +1,36 @@ + + + + + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/layout_base_info_detail.xml b/baselib/src/main/res/layout/layout_base_info_detail.xml index a6d21b1..d743a0a 100644 --- a/baselib/src/main/res/layout/layout_base_info_detail.xml +++ b/baselib/src/main/res/layout/layout_base_info_detail.xml @@ -146,7 +146,7 @@ + android:text="民族" /> { + public List mSelBeans = new ArrayList<>(); + + public ConditionAreaGridAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public ConditionHolder createHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(mContext).inflate(R.layout.item_condition_sel, parent, false); + return new ConditionHolder(view); + } + + @Override + public void bindHolder(ConditionHolder holder, int i) { + AreaGridListBean.RowsBean bean = mData.get(i); + holder.mTvName.setText(bean.getGridName()); + holder.mCbCheck.setOnCheckedChangeListener(null); + holder.mTvName.setTextColor(bean.isCheck() ? Color.parseColor("#1296db") : Color.BLACK); + holder.mCbCheck.setChecked(bean.isCheck()); + holder.mCbCheck.setOnCheckedChangeListener((buttonView, isChecked) -> mLis.onItemCheckChange(bean, isChecked, i)); + holder.itemView.setOnClickListener(v -> mLis.onItemCheckChange(bean, !bean.isCheck(), i)); + } + + private OnItemCheckChange mLis; + + public void addOnitemCheckChange(OnItemCheckChange lis) { + this.mLis = lis; + } + + public interface OnItemCheckChange { + void onItemCheckChange(AreaGridListBean.RowsBean bean, boolean isCheck, int pos); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/AreaGridListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/AreaGridListBean.java index 321db08..33b548c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/AreaGridListBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/AreaGridListBean.java @@ -1,5 +1,7 @@ package com.tengshisoft.commonmodule.beans; +import com.contrarywind.interfaces.IPickerViewData; + import java.io.Serializable; import java.util.List; @@ -39,7 +41,7 @@ public class AreaGridListBean { this.rows = rows; } - public static class RowsBean implements Serializable { + public static class RowsBean implements Serializable, IPickerViewData { private String areaCode; private String areaName; private String fillColor; @@ -184,5 +186,10 @@ public class AreaGridListBean { public void setRelationIdArray(List relationIdArray) { this.relationIdArray = relationIdArray; } + + @Override + public String getPickerViewText() { + return gridName; + } } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java index bfcb2ca..edc63aa 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java @@ -54,14 +54,16 @@ public interface GridApis { */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("app/mongo/data/list/parent-id/{dictionaryParentId}") - Observable> getDictListAllByPid(@Path("dictionaryParentId") String pId, @Header("token") String token); + Observable> getDictListAllByPid(@Path("dictionaryParentId") String pId, + @Header("token") String token); /** * 获取地区 */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("app/area/listbyparentid/{areaParentId}") - Observable> getAreaListByPid(@Path("areaParentId") String dicParentId, @Header("token") String token); + Observable> getAreaListByPid(@Path("areaParentId") String dicParentId, + @Header("token") String token); /** * 获取组织机构列表 @@ -104,7 +106,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/dispatch/list-dispatchdeptuser/{deptId}") - Observable> getPersonListByDeptId(@Path("deptId") String deptId, @Header("token") String token); + Observable> getPersonListByDeptId(@Path("deptId") String deptId, + @Header("token") String token); /** * 获取系统组织部门 @@ -125,21 +128,26 @@ public interface GridApis { */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("app/user-realtime-location/list") - Observable> getUserLocationList(@Query("startTime") String startTime, @Query("endTime") String endTime, @Header("token") String token); + Observable> getUserLocationList(@Query("startTime") String startTime, + @Query("endTime") String endTime, + @Header("token") String token); /** * 根据地区Code获取网格 */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("app/grid/listpage/area-code/{areaCode}") - Observable getGridByAreaCode(@Path("areaCode") String areaCode, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getGridByAreaCode(@Path("areaCode") String areaCode, @Query("keywords") String key, + @Query("page") String page, @Header("token") String token); /** * 不是我的网格列表 */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("app/grid/listpage-not-mine") - Observable getGridByAreaCodeNotMine(@Query("areaCodeLike") String areaCode, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getGridByAreaCodeNotMine(@Query("areaCodeLike") String areaCode, + @Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /*======================================================网格员========================================================================================*/ /*===我的网格列表===*/ @@ -168,21 +176,24 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/community/updatecommunity/{communityId}") - Observable doEditCommunityArea(@Path("communityId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCommunityArea(@Path("communityId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 获取社区列表 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/community/listpagecommunity") - Observable getCommunityAreaList(@Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getCommunityAreaList(@Query("keywords") String keywords, + @Query("page") String page, @Header("token") String token); /** * 获取社区详情 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/community/get/{communityId}") - Observable getCommunityAreaDetailById(@Path("communityId") String id, @Header("token") String token); + Observable getCommunityAreaDetailById(@Path("communityId") String id, + @Header("token") String token); /** * 删除社区 @@ -205,21 +216,26 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/communityintroduction/updatecommunityintroduction/{communityIntroductionId}") - Observable doEditCommunityAreaDesc(@Path("communityIntroductionId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCommunityAreaDesc(@Path("communityIntroductionId") String id, + @Body RequestBody body, @Header("token") String token); /** * 获取社区简介列表 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/communityintroduction/listpagecommunityintroduction") - Observable getCommunityAreaDescList(@Query("communityId") String id, @Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getCommunityAreaDescList(@Query("communityId") String id, + @Query("keywords") String keywords, + @Query("page") String page, + @Header("token") String token); /** * 获取社区简介详情 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/communityintroduction/get/{communityIntroductionId}") - Observable getCommunityAreaDetailDescById(@Path("communityIntroductionId") String id, @Header("token") String token); + Observable getCommunityAreaDetailDescById(@Path("communityIntroductionId") String id + , @Header("token") String token); /** * 删除社区简介 @@ -242,21 +258,24 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/residential/updateresidential/{residentialId}") - Observable doEditCommunity(@Path("residentialId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCommunity(@Path("residentialId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取小区列表 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/residential/listpageresidential") - Observable getCommunityList(@Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getCommunityList(@Query("keywords") String keywords, @Query("page") String page, + @Header("token") String token); /** * 获取小区详情 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/residential/get/{residentialId}") - Observable getCommunityDetailById(@Path("residentialId") String id, @Header("token") String token); + Observable getCommunityDetailById(@Path("residentialId") String id, + @Header("token") String token); /** * 删除小区 @@ -273,46 +292,55 @@ public interface GridApis { @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @POST("app/residentialintroduction/save") Observable doSaveCommunityDesc(@Body RequestBody body, @Header("token") String token); + /** * 获取分拨历史信息 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/distribution/list-all-by-reportid/{reportId}") - Observable> getIncidentDispatchInfo(@Path("reportId") String id, @Header("token") String token); + Observable> getIncidentDispatchInfo(@Path("reportId") String id, + @Header("token") String token); /** * 获取处理历史信息 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/distribution/list-all-handle-by-reportid/{reportId}") - Observable> getIncidentHandleInfo(@Path("reportId") String id, @Header("token") String token); + Observable> getIncidentHandleInfo(@Path("reportId") String id, + @Header("token") String token); /** * 获取核查历史信息 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/check/list-all-by-reportid/{reportId}") - Observable> getIncidentCheckInfo(@Path("reportId") String id, @Header("token") String token); + Observable> getIncidentCheckInfo(@Path("reportId") String id, + @Header("token") String token); + /** * 编辑小区简介 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/residentialintroduction/updateresidentialintroduction/{residentialIntroductionId}") - Observable doEditCommunityDesc(@Path("residentialIntroductionId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCommunityDesc(@Path("residentialIntroductionId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取小区简介列表 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/residentialintroduction/listpageresidentialintroduction") - Observable getCommunityDescList(@Query("residentialId") String id, @Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getCommunityDescList(@Query("residentialId") String id, + @Query("keywords") String keywords, + @Query("page") String page, @Header("token") String token); /** * 获取小区简介详情 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/residentialintroduction/get/{residentialIntroductionId}") - Observable getCommunityDetailDescById(@Path("residentialIntroductionId") String id, @Header("token") String token); + Observable getCommunityDetailDescById(@Path("residentialIntroductionId") String id, + @Header("token") String token); /** * 删除小区简介 @@ -337,7 +365,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/building/listpagebuilding") - Observable getBuildingList(@Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getBuildingList(@Query("keywords") String keywords, @Query("page") String page, + @Header("token") String token); /** * 获取楼宇详情 @@ -358,14 +387,16 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/building/updatebuilding/{buildingId}") - Observable doEditBuilding(@Path("buildingId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditBuilding(@Path("buildingId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取房屋列表 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/buildinghouse/listpagebuildinghouse") - Observable getHouseList(@Query("houseStatus") String status, @Query("keywords") String keywords, @Query("page") String page, @Header("token") String token); + Observable getHouseList(@Query("houseStatus") String status, @Query("keywords") String keywords, + @Query("page") String page, @Header("token") String token); /** @@ -380,14 +411,17 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/buildinghouse/updatebuildinghouse/{buildingHouseId}") - Observable doEditHouse(@Path("buildingHouseId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditHouse(@Path("buildingHouseId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取房屋租住记录 */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/houseuser/listpagehouseuser") - Observable getHouseHireRecordByHouseId(@Query("buildingHouseId") String id, @Query("page") String page, @Header("token") String token); + Observable getHouseHireRecordByHouseId(@Query("buildingHouseId") String id, + @Query("page") String page, + @Header("token") String token); /** * 添加房屋租住记录 @@ -408,7 +442,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/houseuser/updatehouseuser/{houseUserId}") - Observable doEditHirer(@Path("houseUserId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditHirer(@Path("houseUserId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除住户信息 @@ -422,7 +457,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/houseusersub/listpagehouseusersub") - Observable getFamilyMemberList(@Query("houseUserId") String id, @Query("page") String page, @Header("token") String token); + Observable getFamilyMemberList(@Query("houseUserId") String id, @Query("page") String page, + @Header("token") String token); /** * 添加家庭成员 @@ -436,7 +472,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/houseusersub/get/{houseUserSubId}") - Observable getFamilyMemberDetailById(@Path("houseUserSubId") String id, @Header("token") String token); + Observable getFamilyMemberDetailById(@Path("houseUserSubId") String id, + @Header("token") String token); /** * 删除家庭成员 @@ -450,7 +487,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/houseusersub/updatehouseusersub/{houseUserSubId}") - Observable doEditFamilyMember(@Path("houseUserSubId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditFamilyMember(@Path("houseUserSubId") String id, @Body RequestBody body, @Header( + "token") String token); /*========================================楼栋长=======================================*/ /** @@ -458,7 +496,9 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/buildingleader/listpagebuildingleader") - Observable getBuildingManagerList(@Query("buildingId") String id, @Query("page") String page, @Header("token") String token); + Observable getBuildingManagerList(@Query("buildingId") String id, + @Query("page") String page, + @Header("token") String token); /** * 保存楼栋长信息 @@ -472,7 +512,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/buildingleader/updatebuildingleader/{buildingLeaderId}") - Observable doEditBuildingManager(@Path("buildingLeaderId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditBuildingManager(@Path("buildingLeaderId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除楼栋长信息 @@ -486,7 +527,8 @@ public interface GridApis { */ @Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"}) @GET("app/buildingleader/get/{buildingLeaderId}") - Observable getBuildingManagerDetailById(@Path("buildingLeaderId") String id, @Header("token") String token); + Observable getBuildingManagerDetailById(@Path("buildingLeaderId") String id, @Header( + "token") String token); /*========================================学校管理=======================================*/ /** @@ -494,7 +536,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/school/listpageschool") - Observable getSchoolList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getSchoolList(@Query("keywords") String key, @Query("page") String page, @Header( + "token") String token); /** @@ -516,7 +559,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/school/updateschool/{schoolId}") - Observable doEditSchool(@Path("schoolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditSchool(@Path("schoolId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除学校 @@ -532,7 +576,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/schoolkey/listpageschoolkey") - Observable getSchoolEmphasesPersonListById(@Query("schoolId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getSchoolEmphasesPersonListById(@Query("schoolId") String id, @Query( + "keywords") String key, @Query("page") String page, @Header("token") String token); /** @@ -540,7 +585,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/schoolkey/get/{schoolKeyId}") - Observable getSchoolEmphasesPersonDetailById(@Path("schoolKeyId") String id, @Header("token") String token); + Observable getSchoolEmphasesPersonDetailById(@Path("schoolKeyId") String id, + @Header("token") String token); /** * 保存重点人员 @@ -554,7 +600,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/schoolkey/updateschoolkey/{schoolKeyId}") - Observable doEditSchoolEmphases(@Path("schoolKeyId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditSchoolEmphases(@Path("schoolKeyId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除学校人员 @@ -570,7 +617,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/stuteasafe/listpagestuteasafe") - Observable getSchoolCaseListById(@Query("schoolId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getSchoolCaseListById(@Query("schoolId") String id, @Query("keywords") String key, + @Query("page") String page, @Header("token") String token); /** @@ -578,7 +626,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/stuteasafe/get/{stuTeaSafeId}") - Observable getSchoolCaseDetailById(@Path("stuTeaSafeId") String id, @Header("token") String token); + Observable getSchoolCaseDetailById(@Path("stuTeaSafeId") String id, + @Header("token") String token); /** * 保存案件 @@ -592,7 +641,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/stuteasafe/updatestuteasafe/{stuTeaSafeId}") - Observable doEditSchoolCase(@Path("stuTeaSafeId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditSchoolCase(@Path("stuTeaSafeId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除学校案件 @@ -608,11 +658,11 @@ public interface GridApis { */ // @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) // @GET("app/basepopulationinfo/listpagebasepopulationinfo") -// Observable getBaseInfoList(@Query("page") String page, @Query("keywords") String keywords,@Query("type")String type, @Header("token") String token); +// Observable getBaseInfoList(@Query("page") String page, @Query("keywords") String keywords, +// @Query("type")String type, @Header("token") String token); /** * 根据身份证号码查询 - * */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/getByIdCardNumber/{idCardNumber}") @@ -623,13 +673,24 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/listpagemydata") - Observable getBaseInfoList(@Query("page") String page, @Query("keywords") String keywords,@Query("type")String type, @Header("token") String token); + Observable getBaseInfoList(@Query("gridId") String gridId, @Query("page") String page, @Query( + "keywords") String keywords, @Query("type") String type, @Header("token") String token); + /** * 删除人员基础信息 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @DELETE("app/basepopulationinfo/removebasepopulationinfo/{ids}") - Observable doDelBaseInfo(@Path("ids") String id, @Query("reason")String reason,@Header("token") String token); + Observable doDelBaseInfo(@Path("ids") String id, @Query("reason") String reason, + @Header("token") String token); + + /** + * 解绑人员基础信息 + * / + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @DELETE("app/basepopulationinfo/unbind/{id}") + Observable doUnbindBaseInfo(@Path("id") String id, @Header("token") String token); /** * 保存人员基础信息 @@ -638,12 +699,22 @@ public interface GridApis { @POST("app/basepopulationinfo/savebasepopulationinfo") Observable doSaveBaseInfo(@Body RequestBody body, @Header("token") String token); + /** + * 修改人员类型和网格 + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @PUT("app/basepopulationinfo/updatebase/{basePopulationInfoId}/{type}/{gridId}") + Observable doEditPopulaceInfo(@Path("basePopulationInfoId") String id, @Path("type") String type, @Path( + "gridId") String gridId, @Header( + "token") String token); + /** * 编辑人员基础信息 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/basepopulationinfo/updatebasepopulationinfo/{basePopulationInfoId}") - Observable doEditBaseInfo(@Path("basePopulationInfoId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditBaseInfo(@Path("basePopulationInfoId") String id, @Body RequestBody body, @Header( + "token") String token); /** @@ -651,7 +722,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/getbasepopulationinfobyid/{basePopulationInfoId}") - Observable getBaseInfoDetailById(@Path("basePopulationInfoId") String id, @Header("token") String token); + Observable getBaseInfoDetailById(@Path("basePopulationInfoId") String id, + @Header("token") String token); /*===============================================户籍信息================================================*/ /** @@ -666,28 +738,32 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/censusmsg/listpagecensusmsg") - Observable getCensusRegister(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable 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/getcensusmsg") - Observable getCensusRegisterDetail(@Query("censusMsgId") String id, @Header("token") String token); + Observable getCensusRegisterDetail(@Query("censusMsgId") String id, + @Header("token") String token); /** * 户籍信息详情-身份证 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/censusmsg/getcensusmsg") - Observable getCensusRegisterDetailByIdCard(@Query("idCardNumber") String idCard, @Header("token") String token); + Observable getCensusRegisterDetailByIdCard(@Query("idCardNumber") String idCard, + @Header("token") String token); /** * 编辑户籍信息 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/censusmsg/updatecensusmsg/{censusMsgId}") - Observable doEditRegister(@Path("censusMsgId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditRegister(@Path("censusMsgId") String id, @Body RequestBody body, + @Header("token") String token); /** * 保存人员户籍信息 @@ -718,28 +794,32 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/homeperson/updatehomeperson/{homePersonId}") - Observable doEditRear(@Path("homePersonId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditRear(@Path("homePersonId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取留守人员信息详情-身份证 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homeperson/hasmsg/{idCardNumber}") - Observable getCensusRearDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getCensusRearDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 获取留守人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homeperson/listpagehomepersonmydata") - Observable getCensusRearList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getCensusRearList(@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/homeperson/gethomepersonbyid/{homePersonId}") - Observable getCensusRearDetail(@Path("homePersonId") String id, @Header("token") String token); + Observable getCensusRearDetail(@Path("homePersonId") String id, + @Header("token") String token); /*===========================================流动人员===========================================*/ /** @@ -761,28 +841,32 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/floatingpopulation/updatefloatingpopulation/{floatingPopulationId}") - Observable doEditFloating(@Path("floatingPopulationId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditFloating(@Path("floatingPopulationId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 获取流动详情-身份证 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/floatingpopulation/hasmsg/{idCardNumber}") - Observable getCensusFloatingDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getCensusFloatingDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token" + ) String token); /** * 流动人口列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/floatingpopulation/listpagefloatingpopulationmydata") - Observable getCensusNmigrantList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getCensusNmigrantList(@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/floatingpopulation/getfloatingpopulationbyid/{floatingPopulationId}") - Observable getCensusNmigrantDetail(@Path("floatingPopulationId") String id, @Header("token") String token); + Observable getCensusNmigrantDetail(@Path("floatingPopulationId") String id, + @Header("token") String token); /*===========================================境外人员===========================================*/ @@ -798,7 +882,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/overseaspersonnel/listpageoverseaspersonnelmydata") - Observable getOutboundList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getOutboundList(@Query("page") String page, @Query("keywords") String key, @Header( + "token") String token); /** * 删除境外人员 @@ -812,14 +897,16 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/overseaspersonnel/updateoverseaspersonnel/{overseasPersonnelId}") - Observable doEditOutbound(@Path("overseasPersonnelId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditOutbound(@Path("overseasPersonnelId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 获取境外人员详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/overseaspersonnel/getoverseaspersonnelbyid/{overseasPersonnelId}") - Observable getOutboundDetail(@Path("overseasPersonnelId") String id, @Header("token") String token); + Observable getOutboundDetail(@Path("overseasPersonnelId") String id, + @Header("token") String token); /*===========================================艾滋===========================================*/ /** @@ -834,7 +921,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/aids/updateaids/{aidsId}") - Observable doEditAids(@Path("aidsId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditAids(@Path("aidsId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除艾滋 @@ -855,14 +943,16 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/aids/getaidsinfo/{idCardNumber}") - Observable getAidsDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getAidsDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 艾滋人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/aids/listpageaidsmydata") - Observable getAidsList(@Query("page") String page, @Query("keywords") String keywords, @Header("token") String token); + Observable getAidsList(@Query("page") String page, @Query("keywords") String keywords, + @Header("token") String token); /*===========================================吸毒===========================================*/ /** @@ -877,7 +967,8 @@ public interface GridApis { */ @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); + Observable doEditDrug(@Path("addictsId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除吸毒 @@ -898,14 +989,16 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/addicts/getaddictsinfo/{idCardNumber}") - Observable getDrugDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getDrugDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 吸毒人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/addicts/listpageaddictsmydata") - Observable getDrugList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getDrugList(@Query("page") String page, @Query("keywords") String key, @Header( + "token") String token); /*============================================刑满释放===========================================*/ @@ -921,7 +1014,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/releaseaftersentence/updatereleaseaftersentence/{releaseAfterSentenceId}") - Observable doEditCrime(@Path("releaseAfterSentenceId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCrime(@Path("releaseAfterSentenceId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除刑满释放人员信息 @@ -935,21 +1029,24 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/releaseaftersentence/getreleaseaftersentenceinfo") - Observable getCrimeDetailById(@Query("releaseAfterSentenceId") String id, @Header("token") String token); + Observable getCrimeDetailById(@Query("releaseAfterSentenceId") String id, + @Header("token") String token); /** * 根据身份证号码获取详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/releaseaftersentence/getreleaseaftersentenceinfo/{idCardNumber}") - Observable getCrimeDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getCrimeDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 刑满释放人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/releaseaftersentence/listpagereleaseaftersentencemydata") - Observable getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getCrimeList(@Query("page") String page, @Query("keywords") String key, + @Header("token") String token); /*===========================================肇事===========================================*/ @@ -965,7 +1062,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/mentaldisorders/updatementaldisorders/{mentalDisordersId}") - Observable doEditTrouble(@Path("mentalDisordersId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditTrouble(@Path("mentalDisordersId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除肇事 @@ -979,21 +1077,24 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/mentaldisorders/getmentaldisordersinfo/{mentalDisordersId}") - Observable getTroubleDetailById(@Path("mentalDisordersId") String id, @Header("token") String token); + Observable getTroubleDetailById(@Path("mentalDisordersId") String id, + @Header("token") String token); /** * 根据身份证号码获取详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/mentaldisorders/getmentaldisordersinfo/{idCardNumber}") - Observable getTroubleDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getTroubleDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 肇事人员列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/mentaldisorders/listpagementaldisordersmydata") - Observable getTroubleList(@Query("page") String page, @Query("keywords") String keywords, @Header("token") String token); + Observable getTroubleList(@Query("page") String page, @Query("keywords") String keywords, + @Header("token") String token); /*===========================================社区矫正===========================================*/ @@ -1009,7 +1110,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/communitycorrection/updatecommunitycorrection/{communityCorrectionId}") - Observable doEditCorrect(@Path("communityCorrectionId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCorrect(@Path("communityCorrectionId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除社区矫正 @@ -1023,21 +1125,24 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/communitycorrection/getcommunitycorrectioninfo") - Observable getCorrectDetailById(@Query("communityCorrectionId") String id, @Header("token") String token); + Observable getCorrectDetailById(@Query("communityCorrectionId") String id, + @Header("token") String token); /** * 根据身份证号码获取详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/communitycorrection/getcommunitycorrectioninfo/{idCardNumber}") - Observable getCorrectDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getCorrectDetailByIdCard(@Path("idCardNumber") String idCard, + @Header("token") String token); /** * 社区矫正列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/communitycorrection/listpagecommunitycorrectionmydata") - Observable getCorrectList(@Query("page") String page, @Query("keywords") String keywords, @Header("token") String token); + Observable getCorrectList(@Query("page") String page, @Query("keywords") String keywords, + @Header("token") String token); /*===========================================重点青少年===========================================*/ /** @@ -1059,14 +1164,16 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/keyteenagers/updatekeyteenagers/{keyTeenagersId}") - Observable doEditYoung(@Path("keyTeenagersId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditYoung(@Path("keyTeenagersId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取重点青少年列表 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyteenagers/listpagekeyteenagersmydata") - Observable getYoungList(@Query("page") String page, @Query("keywords") String keywords, @Header("token") String token); + Observable getYoungList(@Query("page") String page, @Query("keywords") String keywords, + @Header("token") String token); /** * 获取重点青少年详情 @@ -1080,7 +1187,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyteenagers/hasmsg/{idCardNumber}") - Observable getCensusYoungDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + Observable getCensusYoungDetailByIdCard(@Path("idCardNumber") String idCard, @Header( + "token") String token); /** @@ -1088,7 +1196,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/teenagers-event/list-page-teenagers-event") - Observable getYoungCaseList(@Query("page") String page, @Query("keywords") String keywords, @Header("token") String token); + Observable getYoungCaseList(@Query("page") String page, @Query("keywords") String keywords, + @Header("token") String token); /** * 获取重点青少年事件详情 @@ -1116,7 +1225,8 @@ public interface GridApis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/teenagers-event/update-teenagers-event/{eventId}") - Observable doEditYoungCase(@Path("eventId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditYoungCase(@Path("eventId") String id, @Body RequestBody body, + @Header("token") String token); /*===========================事件、部件==================================*/ @@ -1132,7 +1242,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/parts/listpageparts-me") - Observable getComponentList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getComponentList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 保存部件数据 @@ -1154,14 +1265,16 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/parts/updateparts/{typePartsId}") - Observable doEditPart(@Path("typePartsId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditPart(@Path("typePartsId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取部件信息详情 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/parts/get/{typePartsId}") - Observable getComponentDetailById(@Path("typePartsId") String id, @Header("token") String token); + Observable getComponentDetailById(@Path("typePartsId") String id, + @Header("token") String token); /** * 获取事件类型 @@ -1175,7 +1288,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/parts/listpage-bgid/{bGId}") - Observable getCaseComponentList(@Path("bGId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getCaseComponentList(@Path("bGId") String id, @Query("keywords") String key, + @Query("page") String page, @Header("token") String token); /** * 上报事件 @@ -1189,21 +1303,24 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/report/update/{reportId}") - Observable doEditIncident(@Path("reportId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditIncident(@Path("reportId") String id, @Body RequestBody body, + @Header("token") String token); /** * 我的上报事件列表 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/report/listpage-me") - Observable getIncidentMineList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getIncidentMineList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 我处理过的事件 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/taskbase/listPage-had") - Observable getIncidentMineDoneList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getIncidentMineDoneList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 获取事件详情 @@ -1217,7 +1334,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/taskbase/listpage-task-grid-user-handling") - Observable getIncidentHandleList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getIncidentHandleList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 获取事件派遣详情 @@ -1231,7 +1349,9 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/dispatch/get/{dispatchId}") - Observable getDispatchDetailByDispatchId(@Path("dispatchId") String id, @Header("token") String token); + Observable getDispatchDetailByDispatchId(@Path("dispatchId") String id, + @Header("token") String token); + /** * 获取分拨、处理等信息 */ @@ -1258,42 +1378,48 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @POST("app/taskcompetebase/save-grid-user-handle/{taskId}") - Observable doSaveHandle(@Path("taskId") String id, @Body RequestBody body, @Header("token") String token); + Observable doSaveHandle(@Path("taskId") String id, @Body RequestBody body, + @Header("token") String token); /** * 回退事件 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @POST("app/taskcompetebase/save-grid-user-rollback/{taskId}") - Observable doRollBack(@Path("taskId") String id, @Body RequestBody body, @Header("token") String token); + Observable doRollBack(@Path("taskId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取事件处理记录 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/handle/listpage-report/{reportId}") - Observable getHandleListByReportId(@Path("reportId") String id, @Query("page") String page, @Header("token") String token); + Observable getHandleListByReportId(@Path("reportId") String id, @Query("page") String page, + @Header("token") String token); /** * 获取事件处理记录最新列表 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/handle/list-news/{reportId}") - Observable> getHandleLNewListByReportId(@Path("reportId") String id, @Header("token") String token); + Observable> getHandleLNewListByReportId(@Path("reportId") String id, @Header("token" + ) String token); /** * 获取事件处理详情 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/handle/get-bytaskId/{taskId}") - Observable getHandleDetailByHandleId(@Path("taskId") String id, @Header("token") String token); + Observable getHandleDetailByHandleId(@Path("taskId") String id, + @Header("token") String token); /** * 获取事件核查列表 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/taskbase/listpage-task-examine") - Observable getIncidentCheckList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getIncidentCheckList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 保存事件核查 @@ -1307,14 +1433,16 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @POST("app/taskcompetebase/save-grid-examine/{taskId}") - Observable doSaveIncidentCheckPass(@Path("taskId")String id,@Body RequestBody body, @Header("token") String token); + Observable doSaveIncidentCheckPass(@Path("taskId") String id, @Body RequestBody body, @Header("token" + ) String token); /** * 事件核查不通过 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @POST("app/taskcompetebase/save-examinenopass/{reportId}") - Observable doSaveIncidentCheckUnPass(@Path("reportId") String id, @Body RequestBody body, @Header("token") String token); + Observable doSaveIncidentCheckUnPass(@Path("reportId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 获取事件日志 @@ -1336,7 +1464,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/taskcompetebase/update-areadispatch/{reportId}") - Observable doDownIncident(@Path("reportId") String reportId, @Body RequestBody body, @Header("token") String token); + Observable doDownIncident(@Path("reportId") String reportId, @Body RequestBody body, + @Header("token") String token); /** @@ -1344,7 +1473,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/taskcompetebase/update-areatransfer/{reportId}") - Observable doTurnIncident(@Path("reportId") String reportId, @Body RequestBody body, @Header("token") String token); + Observable doTurnIncident(@Path("reportId") String reportId, @Body RequestBody body, + @Header("token") String token); /** * 标记为标杆案件 @@ -1372,7 +1502,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/collect/listPageMe") - Observable getMineCollectIncidentList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getMineCollectIncidentList(@Query("keywords") String key, @Query("page") String page + , @Header("token") String token); /** * 取消收藏 @@ -1386,14 +1517,17 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/taskbase/listPage-archive") - Observable getArchiveIncidentList(@Query("keywords") String key, @Query("page") String page, @Query("areaCode") String areaCode, @Header("token") String token); + Observable getArchiveIncidentList(@Query("keywords") String key, @Query("page") String page, + @Query("areaCode") String areaCode, + @Header("token") String token); /** * 获取案件回访记录 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/pary/listpage/{reportId}") - Observable getReturnRecordIncidentList(@Path("reportId") String id, @Query("page") String page, @Header("token") String token); + Observable getReturnRecordIncidentList(@Path("reportId") String id, @Query("page") String page, + @Header("token") String token); /** @@ -1415,7 +1549,8 @@ public interface GridApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/evaluate/getbyreportid/{reportId}") - Observable getIncidentAppraiseDetailById(@Path("reportId") String id, @Header("token") String token); + Observable getIncidentAppraiseDetailById(@Path("reportId") String id, + @Header("token") String token); /*=========================================任务=========================================*/ /** @@ -1423,14 +1558,17 @@ public interface GridApis { */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/statistics/task_sys_info") - Observable> getTaskStatistCount(@Query("startTime") String start, @Query("endTime") String end, @Header("token") String token); + Observable> getTaskStatistCount(@Query("startTime") String start, + @Query("endTime") String end, + @Header("token") String token); /** * 根据部门获取任务数量 */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/statistics/task_sys_info_dept/{deptId}") - Observable> getTaskStatistCountByDept(@Path("deptId") String id, @Header("token") String token); + Observable> getTaskStatistCountByDept(@Path("deptId") String id, + @Header("token") String token); /** * 获取任务列表 @@ -1459,7 +1597,8 @@ public interface GridApis { */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/receiveruser/get/{receiverUserId}") - Observable getTaskReceiveDetailById(@Path("receiverUserId") String id, @Header("token") String token); + Observable getTaskReceiveDetailById(@Path("receiverUserId") String id, + @Header("token") String token); /** @@ -1467,7 +1606,8 @@ public interface GridApis { */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/receiveruser/updatereceiveruser/{receiverUserId}") - Observable getTask(@Path("receiverUserId") String id, @Body RequestBody body, @Header("token") String token); + Observable getTask(@Path("receiverUserId") String id, @Body RequestBody body, + @Header("token") String token); /** * 上报任务内容 @@ -1481,21 +1621,27 @@ public interface GridApis { */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/receiveruserpatrol/listpagereceiveruserpatrol") - Observable getTaskReportList(@Query("taskMatterId") String taskMatterId, @Query("userIdx") String useIdx, @Query("business") String business, @Query("matterId") String matterId, @Query("receiverUserId") String id, @Query("page") String page, @Header("token") String token); + Observable getTaskReportList(@Query("taskMatterId") String taskMatterId, + @Query("userIdx") String useIdx, + @Query("business") String business, + @Query("matterId") String matterId, @Query( + "receiverUserId") String id, @Query("page") String page, @Header("token") String token); /** * 获取任务上报记录详情 */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/receiveruserpatrol/get/{receiverUserPatrolId}") - Observable getTaskReportDetailById(@Path("receiverUserPatrolId") String id, @Header("token") String token); + Observable getTaskReportDetailById(@Path("receiverUserPatrolId") String id, @Header( + "token") String token); /** * 修改任务上报记录 */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/receiveruserpatrol/updatereceiveruserpatrol/{receiverUserPatrolId}") - Observable doEditTaskReportRecord(@Path("receiverUserPatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditTaskReportRecord(@Path("receiverUserPatrolId") String id, @Body RequestBody body, + @Header("token") String token); /** @@ -1504,14 +1650,19 @@ public interface GridApis { */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/distribute/listpagematter") - Observable getTaskBusinessList(@Query("userMatterId") String id, @Query("distributeId") String taskId, @Query("business") String business, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getTaskBusinessList(@Query("userMatterId") String id, + @Query("distributeId") String taskId, + @Query("business") String business, + @Query("keywords") String key, @Query( + "page") String page, @Header("token") String token); /** * 上报任务状态 */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/receiveruser/updatereceiveruser/{receiverUserId}") - Observable doSaveTaskState(@Path("receiverUserId") String id, @Body RequestBody body, @Header("token") String token); + Observable doSaveTaskState(@Path("receiverUserId") String id, @Body RequestBody body, @Header( + "token") String token); /*=========================================9+x=========================================*/ /*重点区域*/ @@ -1521,7 +1672,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyareacheckrenovation/listpagekeyareacheckrenovation") - Observable getKeyAreaList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getKeyAreaList(@Query("keywords") String key, @Query("page") String page, @Header( + "token") String token); /** * 新增重点区域 @@ -1535,7 +1687,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/keyareacheckrenovation/updatekeyareacheckrenovation/{keyAreaCheckRenovationId}") - Observable doEditKeyArea(@Path("keyAreaCheckRenovationId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyArea(@Path("keyAreaCheckRenovationId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除重点区域 @@ -1549,7 +1702,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyareacheckrenovation/get/{keyAreaCheckRenovationId}") - Observable getKeyAreaDetailById(@Path("keyAreaCheckRenovationId") String id, @Header("token") String token); + Observable getKeyAreaDetailById(@Path("keyAreaCheckRenovationId") String id, + @Header("token") String token); /*重点场所*/ @@ -1558,7 +1712,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyplace/listpagekeyplace") - Observable getKeyPlaceList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getKeyPlaceList(@Query("keywords") String key, @Query("page") String page, @Header( + "token") String token); /** * 新增重点场所 @@ -1572,7 +1727,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/keyplace/updatekeyplace/{keyPlaceId}") - Observable doEditKeyPlace(@Path("keyPlaceId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyPlace(@Path("keyPlaceId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除重点场所 @@ -1595,7 +1751,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/line/listpageline") - Observable getKeyRoadList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getKeyRoadList(@Query("keywords") String key, @Query("page") String page, @Header( + "token") String token); /** * 新增护路护线场所 @@ -1609,7 +1766,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/line/updateline/{lineId}") - Observable doEditKeyRoad(@Path("lineId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyRoad(@Path("lineId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除护路护线 @@ -1634,7 +1792,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/linecase/listpagelinecase") - Observable getKeyRoadCaseList(@Query("lineId") String lineId, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getKeyRoadCaseList(@Query("lineId") String lineId, @Query("keywords") String key, + @Query("page") String page, @Header("token") String token); /** * 新增护路护线场所案件 @@ -1648,7 +1807,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/linecase/updatelinecase/{lineCaseId}") - Observable doEditKeyRoadCase(@Path("lineCaseId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyRoadCase(@Path("lineCaseId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除护路护线案件 @@ -1662,7 +1822,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/linecase/get/{lineCaseId}") - Observable getKeyRoadCaseDetailById(@Path("lineCaseId") String id, @Header("token") String token); + Observable getKeyRoadCaseDetailById(@Path("lineCaseId") String id, + @Header("token") String token); @@ -1675,7 +1836,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicide/listpagehomicide") - Observable getPenalList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getPenalList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 新增命案基本信息 @@ -1689,7 +1851,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/homicide/updatehomicide/{homicideId}") - Observable doEditPenal(@Path("homicideId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditPenal(@Path("homicideId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除命案防控 @@ -1712,7 +1875,10 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidesuspect/listpagehomicidesuspect") - Observable getPenalSuspicionList(@Query("keywords") String key, @Query("homicideId") String caseId, @Query("page") String page, @Header("token") String token); + Observable getPenalSuspicionList(@Query("keywords") String key, + @Query("homicideId") String caseId, + @Query("page") String page, + @Header("token") String token); /** * 新增命案基本信息 @@ -1726,7 +1892,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/homicidesuspect/updatehomicidesuspect/{homicideSuspectId}") - Observable doEditSuspicion(@Path("homicideSuspectId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditSuspicion(@Path("homicideSuspectId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除命案防控 @@ -1740,7 +1907,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidesuspect/get/{homicideSuspectId}") - Observable getSuspicionDetailById(@Path("homicideSuspectId") String id, @Header("token") String token); + Observable getSuspicionDetailById(@Path("homicideSuspectId") String id, + @Header("token") String token); /** * 命案受害人 @@ -1748,7 +1916,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidevictim/listpagehomicidevictim") - Observable getPenalVictimList(@Query("keywords") String key, @Query("homicideId") String caseId, @Query("page") String page, @Header("token") String token); + Observable getPenalVictimList(@Query("keywords") String key, @Query("homicideId") String caseId, + @Query("page") String page, @Header("token") String token); /** * 新增受害人信息 @@ -1762,7 +1931,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/homicidevictim/updatehomicidevictim/{homicideVictimId}") - Observable doEditVictim(@Path("homicideVictimId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditVictim(@Path("homicideVictimId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除受害人 @@ -1776,7 +1946,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidevictim/get/{homicideVictimId}") - Observable getVictimDetailById(@Path("homicideVictimId") String id, @Header("token") String token); + Observable getVictimDetailById(@Path("homicideVictimId") String id, + @Header("token") String token); /* 快递物流*/ /** @@ -1784,7 +1955,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafe/listpagelogisticssafe") - Observable getExpressList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getExpressList(@Query("keywords") String key, @Query("page") String page, @Header( + "token") String token); /** * 新增快递物流基本信息 @@ -1798,7 +1970,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/logisticssafe/updatelogisticssafe/{logisticsSafeId}") - Observable doEditExpress(@Path("logisticsSafeId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditExpress(@Path("logisticsSafeId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除快递物流防控 @@ -1812,7 +1985,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafe/get/{logisticsSafeId}") - Observable getExpressDetailById(@Path("logisticsSafeId") String id, @Header("token") String token); + Observable getExpressDetailById(@Path("logisticsSafeId") String id, + @Header("token") String token); /*================================================================= 巡检巡查 ========================================*/ /*重点区域巡查*/ @@ -1822,7 +1996,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyareacheckrenovationpatrol/listpagekeyareacheckrenovationpatrol") - Observable getPatrolKeyAreaList(@Query("keyAreaCheckRenovationId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getPatrolKeyAreaList(@Query("keyAreaCheckRenovationId") String id, @Query( + "keywords") String key, @Query("page") String page, @Header("token") String token); /** * 保存重点区域巡查记录 @@ -1836,7 +2011,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/keyareacheckrenovationpatrol/updatekeyareacheckrenovationpatrol/{keyAreaCheckRenovationPatrolId}") - Observable doEditKeyAreaPatrol(@Path("keyAreaCheckRenovationPatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyAreaPatrol(@Path("keyAreaCheckRenovationPatrolId") String id, + @Body RequestBody body, @Header("token") String token); /** * 删除重点区域巡查记录 @@ -1850,7 +2026,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyareacheckrenovationpatrol/get/{keyAreaCheckRenovationPatrolId}") - Observable getKeyAreaPatrolDetailById(@Path("keyAreaCheckRenovationPatrolId") String id, @Header("token") String token); + Observable getKeyAreaPatrolDetailById(@Path("keyAreaCheckRenovationPatrolId") String id, + @Header("token") String token); /*命案巡查*/ @@ -1859,7 +2036,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidepatrol/listpagehomicidepatrol") - Observable getPatrolPenalList(@Query("homicideId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getPatrolPenalList(@Query("homicideId") String id, @Query("keywords") String key, + @Query("page") String page, @Header("token") String token); /** * 保存命案巡查记录 @@ -1873,7 +2051,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/homicidepatrol/updatehomicidepatrol/{homicidePatrolId}") - Observable doEditPenalPatrol(@Path("homicidePatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditPenalPatrol(@Path("homicidePatrolId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 删除命案巡查记录 @@ -1887,7 +2066,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidepatrol/get/{homicidePatrolId}") - Observable getPenalPatrolDetailById(@Path("homicidePatrolId") String id, @Header("token") String token); + Observable getPenalPatrolDetailById(@Path("homicidePatrolId") String id, + @Header("token") String token); @@ -1898,7 +2078,9 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafepatrol/listpagelogisticssafepatrol") - Observable getExpressPatrolList(@Query("logisticsSafeId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getExpressPatrolList(@Query("logisticsSafeId") String id, + @Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 保存快递巡查记录 @@ -1912,7 +2094,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/logisticssafepatrol/updatelogisticssafepatrol/{logisticsSafePatrolId}") - Observable doEditExpressPatrol(@Path("logisticsSafePatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditExpressPatrol(@Path("logisticsSafePatrolId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除快递巡查记录 @@ -1926,7 +2109,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafepatrol/get/{logisticsSafePatrolId}") - Observable getExpressPatrolDetailById(@Path("logisticsSafePatrolId") String id, @Header("token") String token); + Observable getExpressPatrolDetailById(@Path("logisticsSafePatrolId") String id, @Header( + "token") String token); /*重点场所巡查*/ @@ -1935,7 +2119,10 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyplacepatrol/listpagekeyplacepatrol") - Observable getKeyPlacePatrolList(@Query("keyPlaceId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getKeyPlacePatrolList(@Query("keyPlaceId") String id, + @Query("keywords") String key, + @Query("page") String page, + @Header("token") String token); /** * 保存重点场所巡查记录 @@ -1949,7 +2136,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/keyplacepatrol/updatekeyplacepatrol/{keyPlacePatrolId}") - Observable doEditKeyPlacePatrol(@Path("keyPlacePatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditKeyPlacePatrol(@Path("keyPlacePatrolId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除重点场所巡查记录 @@ -1963,7 +2151,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/keyplacepatrol/get/{keyPlacePatrolId}") - Observable getKeyPlacePatrolDetailById(@Path("keyPlacePatrolId") String id, @Header("token") String token); + Observable getKeyPlacePatrolDetailById(@Path("keyPlacePatrolId") String id, @Header( + "token") String token); @@ -1974,7 +2163,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafepatrol/listpagelogisticssafepatrol") - Observable getEnterprisePatrolList(@Query("logisticsSafeId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getEnterprisePatrolList(@Query("logisticsSafeId") String id, @Query( + "keywords") String key, @Query("page") String page, @Header("token") String token); /** * 保存企业巡查记录 @@ -1988,7 +2178,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/logisticssafepatrol/updatelogisticssafepatrol/{logisticsSafePatrolId}") - Observable doEditEnterprisePatrol(@Path("logisticsSafePatrolId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditEnterprisePatrol(@Path("logisticsSafePatrolId") String id, @Body RequestBody body, + @Header("token") String token); /** * 删除企业巡查记录 @@ -2002,7 +2193,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/logisticssafepatrol/get/{logisticsSafePatrolId}") - Observable getEnterprisePatrolDetailById(@Path("logisticsSafePatrolId") String id, @Header("token") String token); + Observable getEnterprisePatrolDetailById(@Path("logisticsSafePatrolId") String id, + @Header("token") String token); /*==========================================知识库====================================================*/ @@ -2012,49 +2204,62 @@ public interface GridApis { */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @GET("app/knowledge-lib/list-page-knowledge-lib") - Observable getLibraryList(@Query("sourceDept") String deptId, @Query("category") String category, @Query("keywords") String key, @Query("page") String page, @Query("publishType") String pType, @Header("token") String token); + Observable getLibraryList(@Query("sourceDept") String deptId, + @Query("category") String category, @Query("keywords") String key, + @Query("page") String page, @Query( + "publishType") String pType, @Header("token") String token); /** * 获取知识详情 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @GET("app/knowledge-lib/get-knowledge-lib-by-id/{knowledgeId}") - Observable getKnowLedgeDetailById(@Path("knowledgeId") String id, @Header("token") String token); + Observable getKnowLedgeDetailById(@Path("knowledgeId") String id, + @Header("token") String token); /** * 保存知识评价 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @POST("app/knowledge-appraise/save-appraise/{knowledgeId}") - Observable doSaveKnowLedgeLevel(@Path("knowledgeId") String id, @Body RequestBody body, @Header("token") String token); + Observable doSaveKnowLedgeLevel(@Path("knowledgeId") String id, @Body RequestBody body, @Header( + "token") String token); /** * 保存纠错内容 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @POST("app/knowledge-correction/save-correction/{knowledgeId}") - Observable doSaveKnowLedgeCorrection(@Path("knowledgeId") String id, @Body RequestBody body, @Header("token") String token); + Observable doSaveKnowLedgeCorrection(@Path("knowledgeId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取知识评价列表 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @GET("app/knowledge-appraise/list-page-knowledge-appraise") - Observable getKnowLedgeAppraiseList(@Query("knowledgeId") String id, @Query("page") String page, @Header("token") String token); + Observable getKnowLedgeAppraiseList(@Query("knowledgeId") String id, + @Query("page") String page, + @Header("token") String token); /** * 获取部门黄页部门列表 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @GET("app/dept-yellow-page/release/list-dept-pid") - Observable> getKnowLedgeDeptList(@Query("departmentParentId") String pid, @Header("token") String token); + Observable> getKnowLedgeDeptList(@Query("departmentParentId") String pid, + @Header("token") String token); /** * 根据部门获取知识库列表 */ @Headers({"base_url_name:library", "Content-Type: application/json", "Accept: application/json"}) @GET("app/dept-yellow-page/list-page-knowledge-lib") - Observable getLibraryListByDept(@Query("category") String category, @Query("sourceDept") String deptId, @Query("keywords") String key, @Query("page") String page, @Query("publishType") String pType, @Header("token") String token); + Observable getLibraryListByDept(@Query("category") String category, + @Query("sourceDept") String deptId, + @Query("keywords") String key, @Query("page") String page, + @Query( + "publishType") String pType, @Header("token") String token); /*==========================================俩新组织====================================================*/ /*==非公有制经济组织===*/ @@ -2063,14 +2268,16 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/enterprise/listpage") - Observable getNonPublicOrgList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getNonPublicOrgList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 获取非公有制经济组织详情 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/enterprise/get/{enterpriseId}") - Observable getNonPublicOrgDetailById(@Path("enterpriseId") String id, @Header("token") String token); + Observable getNonPublicOrgDetailById(@Path("enterpriseId") String id, + @Header("token") String token); /** * 删除非公有制经济组织 @@ -2091,7 +2298,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/enterprise/updateenterprise/{enterpriseId}") - Observable doEditNonPublicOrg(@Path("enterpriseId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditNonPublicOrg(@Path("enterpriseId") String id, @Body RequestBody body, @Header( + "token") String token); /*==社会组织===*/ @@ -2101,14 +2309,16 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/organization/listpage") - Observable getSocialOrgList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getSocialOrgList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 获取社会组织详情 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/organization/get/{organizationId}") - Observable getSocialOrgDetailById(@Path("organizationId") String id, @Header("token") String token); + Observable getSocialOrgDetailById(@Path("organizationId") String id, + @Header("token") String token); /** * 删除社会组织 @@ -2129,7 +2339,8 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/organization/updateorganization/{organizationId}") - Observable doEditSocialOrg(@Path("organizationId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditSocialOrg(@Path("organizationId") String id, @Body RequestBody body, @Header("token" + ) String token); /*==========================================汽车管理====================================================*/ /** @@ -2137,7 +2348,8 @@ public interface GridApis { */ @Headers({"base_url_name:usercenter", "Content-Type: application/json", "Accept: application/json"}) @GET("app/car/listpage") - Observable getCarList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getCarList(@Query("keywords") String key, @Query("page") String page, + @Header("token") String token); /** * 获取汽车详情 @@ -2173,7 +2385,8 @@ public interface GridApis { */ @Headers({"base_url_name:usercenter", "Content-Type: application/json", "Accept: application/json"}) @GET("app/car-belong/listpage") - Observable getCarBelongPersonList(@Query("page") String page, @Header("token") String token); + Observable getCarBelongPersonList(@Query("page") String page, + @Header("token") String token); /** * 车辆使用人列表 @@ -2216,7 +2429,8 @@ public interface GridApis { */ @Headers({"base_url_name:usercenter", "Content-Type: application/json", "Accept: application/json"}) @GET("app/car-belong/get/{carBelongId}") - Observable getCarBelongDetailById(@Path("carBelongId") String id, @Header("token") String token); + Observable getCarBelongDetailById(@Path("carBelongId") String id, + @Header("token") String token); /** * 获取汽车使用人详情 @@ -2231,7 +2445,8 @@ public interface GridApis { */ @Headers({"base_url_name:usercenter", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/car-belong/updatecarbelong/{carBelongId}") - Observable doEditCarBelong(@Path("carBelongId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCarBelong(@Path("carBelongId") String id, @Body RequestBody body, + @Header("token") String token); /** @@ -2239,7 +2454,8 @@ public interface GridApis { */ @Headers({"base_url_name:usercenter", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/car-user/updatecaruser/{carUserId}") - Observable doEditCarUse(@Path("carUserId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditCarUse(@Path("carUserId") String id, @Body RequestBody body, + @Header("token") String token); /*===========日志=========*/ @@ -2252,7 +2468,8 @@ public interface GridApis { //修改日志 @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @PUT("app/gridlog/update/{gridLogId}") - Observable doEditGridLog(@Path("gridLogId") String id, @Body RequestBody body, @Header("token") String token); + Observable doEditGridLog(@Path("gridLogId") String id, @Body RequestBody body, + @Header("token") String token); //我的上报日志 @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java new file mode 100644 index 0000000..9b8ee7e --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java @@ -0,0 +1,84 @@ +package com.tengshisoft.commonmodule.views; + +import android.content.Context; +import android.graphics.Color; +import android.util.DisplayMetrics; +import android.view.Gravity; +import android.view.View; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.tengshisoft.commonmodule.adapters.ConditionAreaGridAdapter; +import com.tengshisoft.commonmodule.beans.AreaGridListBean; +import com.tenlionsoft.baselib.R; + +import java.util.ArrayList; +import java.util.List; + +import razerdp.basepopup.BasePopupWindow; + +/** + * 作者: adam + * 日期: 2021/9/30 - 2:58 下午 + * 邮箱: itgaojian@163.com + * 描述: 条件选择-网格 + */ +public class ConditionAreaGridPopup extends BasePopupWindow { + private List mDatas; + private RecyclerView mRlvConditions; + private ConditionAreaGridAdapter mAdapter; + private OnListPopupItemClickListener mOnListPopupItemClickListener; + + public ConditionAreaGridPopup(Context context, List datas) { + super(context); + View view = createPopupById(R.layout.popup_condition_layout); + RecyclerView rlvCondition = view.findViewById(R.id.rlv_conditions); + if (datas == null) { + mDatas = new ArrayList<>(); + } else { + mDatas = datas; + } + mAdapter = new ConditionAreaGridAdapter(context, mDatas); + rlvCondition.setLayoutManager(new LinearLayoutManager(context)); + rlvCondition.setAdapter(mAdapter); + setContentView(view); + + setBackgroundColor(Color.parseColor("#11000000")); + setPopupGravity(Gravity.BOTTOM | Gravity.CENTER); + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + int height = (int) (displayMetrics.heightPixels * 0.5); + setHeight(height); + mAdapter.addOnitemCheckChange((bean, isCheck, pos) -> { + if (isCheck) { + mAdapter.mSelBeans.clear(); + mAdapter.mSelBeans.add(bean); + bean.setCheck(isCheck); + mOnListPopupItemClickListener.onItemClick(bean, isCheck, pos); + } + if (isCheck) { + if (true) { + for (int i = 0; i < mAdapter.getData().size(); i++) { + if (!mAdapter.getData().get(i).getGridId().equals(bean.getGridId())) { + mAdapter.getData().get(i).setCheck(false); + } + } + } + } + mAdapter.notifyDataSetChanged(); + }); + } + + + public OnListPopupItemClickListener getOnListPopupItemClickListener() { + return mOnListPopupItemClickListener; + } + + public void setOnListPopupItemClickListener(OnListPopupItemClickListener onListPopupItemClickListener) { + mOnListPopupItemClickListener = onListPopupItemClickListener; + } + + public interface OnListPopupItemClickListener { + void onItemClick(AreaGridListBean.RowsBean bean, boolean isCheck, int pos); + } +} diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png b/commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..73410431e308fc664125319dbe98578826952346 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`C{|UO78#w literal 0 HcmV?d00001 diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java index 11616b1..0db76c8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java @@ -2,6 +2,7 @@ package com.tengshisoft.gridmodule.incident.activitys.populace; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Intent; import android.graphics.Color; import android.text.TextUtils; import android.view.View; @@ -9,9 +10,11 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -20,13 +23,16 @@ 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.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; +import com.tengshisoft.commonmodule.views.ConditionAreaGridPopup; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.views.CenterBaseInputView; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; @@ -67,6 +73,10 @@ public class CensusBaseActivity extends BaseActivity { EditText mEtSearchCentent; @BindView(R2.id.iv_clear) ImageView mIvClear; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + @BindView(R2.id.ll_grid) + LinearLayout mLlGrid; private Unbinder mBind; private int mCurPage = 1; private CensusPersonAdapter mAdapter; @@ -131,7 +141,7 @@ public class CensusBaseActivity extends BaseActivity { }); refreshView(STATE_LOAD_SUCCESS); setStateView(13); - refreshData(); + getMineGridList(); mEtSearchCentent.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) { hideSoftKeyboard(); @@ -159,9 +169,79 @@ public class CensusBaseActivity extends BaseActivity { }); mIvClear.setOnClickListener(v -> { mEtSearchCentent.setText(""); - mKeywords=""; + mKeywords = ""; refreshData(); }); + mTvGrid.setOnClickListener(v -> onShowGrid()); + } + + private List mGridList; + private AreaGridListBean.RowsBean mSelGrid; + + /** + * 选择网格 + */ + private void onShowGrid() { + ConditionAreaGridPopup conditionPopup = new ConditionAreaGridPopup(mActivity, mGridList); + conditionPopup.setOnListPopupItemClickListener((bean, isCheck, pos) -> { + if (isCheck) { + //选中了 + mSelGrid = bean; + mTvGrid.setText(mSelGrid.getGridName()); + } else { + //清除了选项 + mSelGrid = null; + mTvGrid.setText("网格"); + } + refreshData(); + conditionPopup.dismiss(); + }); + conditionPopup.showPopupWindow(mTvGrid); + } + + + private void getMineGridList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getMineGridList(UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@androidx.annotation.NonNull Disposable d) { + + } + + @Override + public void onNext(@androidx.annotation.NonNull List rowsBeans) { + if (rowsBeans.size() > 0) { + mGridList = rowsBeans; + mSelGrid = mGridList.get(0); + if (mGridList.size() > 1) { + mGridList.get(0).setCheck(true); + mLlGrid.setVisibility(View.VISIBLE); + mTvGrid.setText(mSelGrid.getGridName()); + } else { + mLlGrid.setVisibility(View.GONE); + } + refreshData(); + } else { + mLlGrid.setVisibility(View.GONE); + ToastUtils.show("您暂未分配网格"); + setStateView(15); + } + } + + @Override + public void onError(@androidx.annotation.NonNull Throwable e) { + ExceptionHandler.handleException(e); + setStateView(16); + } + + @Override + public void onComplete() { + + } + }); } @@ -208,7 +288,7 @@ public class CensusBaseActivity extends BaseActivity { dialog1.show(); RetrofitManager.getInstance() .create(GridApis.class) - .doDelBaseInfo(bean.getBasePopulationInfoId(),"", UserLgUtils.getToken()) + .doDelBaseInfo(bean.getBasePopulationInfoId(), "", UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -253,7 +333,7 @@ public class CensusBaseActivity extends BaseActivity { .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD) .withString("title", "人口基础信息编辑") .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity,12); } /** @@ -265,7 +345,18 @@ public class CensusBaseActivity extends BaseActivity { ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_DETAIL) .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity, 12); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if (requestCode == 12) { + if (resultCode == 13) { + refreshData(); + } + } + super.onActivityResult(requestCode, resultCode, data); } /** @@ -279,6 +370,7 @@ public class CensusBaseActivity extends BaseActivity { } private void refreshData() { + setStateView(13); getUpcomingList(1, null); } @@ -294,7 +386,8 @@ public class CensusBaseActivity extends BaseActivity { mCurPage = page; RetrofitManager.getInstance() .create(GridApis.class) - .getBaseInfoList(page + "", mKeywords, "1",UserLgUtils.getToken()) + .getBaseInfoList(mSelGrid == null ? "" : mSelGrid.getGridId(), page + "", mKeywords, "1", + UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java index 2638edc..bf14493 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java @@ -8,7 +8,6 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.hjq.toast.ToastUtils; -import com.tengshisoft.commonmodule.beans.CensusPersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; @@ -109,8 +108,56 @@ public class CensusBaseDetailActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); mId = getIntent().getStringExtra("id"); getDetailData(mId); - mBtnDel.setOnClickListener(v -> onShowDelReason()); + mBtnDel.setOnClickListener(v -> doUnbindInfo()); } + + /** + * 解绑人员 + */ + private void doUnbindInfo() { + AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); + builder.setTitle("提示") + .setMessage("您确定要解绑该人员吗?") + .setPositiveButton("确定", (dialog, which) -> { + dialog.dismiss(); + ProgressDialog dialog1 = UIUtil.initDialog(mActivity, "解绑中..."); + dialog1.show(); + RetrofitManager.getInstance() + .create(GridApis.class) + .doUnbindBaseInfo(mId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog1.dismiss(); + ToastUtils.show("解绑成功"); + setResult(13); + finish(); + } + + @Override + public void onError(@NonNull Throwable e) { + dialog1.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + }) + .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) + .create() + .show(); + } + private void onShowDelReason() { CenterBaseInputView intputView = new CenterBaseInputView.DialogBuilder(mActivity).build(); intputView.addOnChoseListener((time, content) -> { @@ -120,6 +167,7 @@ public class CensusBaseDetailActivity extends BaseActivity { }); intputView.show(); } + /** * 获取详细信息 * @@ -127,32 +175,32 @@ public class CensusBaseDetailActivity extends BaseActivity { */ private void getDetailData(String id) { RetrofitManager.getInstance() - .create(GridApis.class) - .getBaseInfoDetailById(id, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getBaseInfoDetailById(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull PersonSearchBean searchBaseInfoBean) { - setDataToView(searchBaseInfoBean, 0); - } + @Override + public void onNext(@NonNull PersonSearchBean searchBaseInfoBean) { + setDataToView(searchBaseInfoBean, 0); + } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + ExceptionHandler.handleException(e); + refreshView(STATE_LOAD_ERROR); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -161,45 +209,45 @@ public class CensusBaseDetailActivity extends BaseActivity { private void doDelBean(String content) { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); builder.setTitle("提示") - .setMessage("确定要删除该条信息吗?") - .setPositiveButton("确定", (dialog, which) -> { - dialog.dismiss(); - ProgressDialog dialog1 = UIUtil.initDialog(mActivity, "删除中..."); - dialog1.show(); - RetrofitManager.getInstance() - .create(GridApis.class) - .doDelBaseInfo(mId,content, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .setMessage("确定要删除该条信息吗?") + .setPositiveButton("确定", (dialog, which) -> { + dialog.dismiss(); + ProgressDialog dialog1 = UIUtil.initDialog(mActivity, "删除中..."); + dialog1.show(); + RetrofitManager.getInstance() + .create(GridApis.class) + .doDelBaseInfo(mId, content, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog1.dismiss(); - ToastUtils.show("删除成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog1.dismiss(); + ToastUtils.show("删除成功"); + setResult(13); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog1.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog1.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); - }) - .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) - .create() - .show(); + } + }); + }) + .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) + .create() + .show(); } /** @@ -224,12 +272,12 @@ public class CensusBaseDetailActivity extends BaseActivity { mEtPhone.setText(bean.getTelephone());//联系方式 mEtCensusDetail.setText(bean.getNativePlaceAddr());//户籍地详址 mEtCurDetail.setText(bean.getCurrentResidenceAddr());//现在详细地址 - if(!TextUtils.isEmpty(bean.getType())){ - switch (bean.getType()){ + if (!TextUtils.isEmpty(bean.getType())) { + switch (bean.getType()) { case "1": mTvType.setText("户籍人口"); break; - case"2": + case "2": mTvType.setText("常住人口"); break; case "3": diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java index 87855ba..6836718 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java @@ -166,6 +166,10 @@ public class CensusBaseEnterActivity extends BaseActivity { mBind = ButterKnife.bind(this); mId = getIntent().getStringExtra("id"); String title = getIntent().getStringExtra("title"); + String idCard = getIntent().getStringExtra("idCard"); + if(!TextUtils.isEmpty(idCard)){ + mEtIdentity.setText(idCard); + } if (!TextUtils.isEmpty(mId)) { //编辑 refreshView(STATE_LOAD_LOADING); @@ -197,6 +201,7 @@ public class CensusBaseEnterActivity extends BaseActivity { .navigation(mActivity, 15); } }); + mTvArea.setOnClickListener(v -> onShowArea()); mEtIdentity.addTextChangedListener(new TextChange() { @Override @@ -282,6 +287,7 @@ public class CensusBaseEnterActivity extends BaseActivity { public void onNext(@NonNull SuccessBean successBean) { dialog.dismiss(); ToastUtils.show("新增成功"); + setResult(13); finish(); } @@ -317,6 +323,7 @@ public class CensusBaseEnterActivity extends BaseActivity { public void onNext(@NonNull SuccessBean successBean) { dialog.dismiss(); ToastUtils.show("修改成功"); + setResult(13); finish(); } @@ -419,7 +426,7 @@ public class CensusBaseEnterActivity extends BaseActivity { } String nation = mTvNation.getText().toString().trim(); if (TextUtils.isEmpty(nation)) { - ToastUtils.show("请选择名族"); + ToastUtils.show("请选择民族"); return false; } String marry = mTvMarry.getText().toString().trim(); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java index 0bf9aa9..7613464 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java @@ -2,7 +2,10 @@ package com.tengshisoft.gridmodule.incident.activitys.populace; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; import android.text.TextUtils; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -14,22 +17,34 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; +import com.bigkoo.pickerview.builder.OptionsPickerBuilder; +import com.bigkoo.pickerview.view.OptionsPickerView; +import com.google.gson.Gson; import com.hjq.toast.ToastUtils; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; +import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; +import com.tengshisoft.commonmodule.beans.SavePersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.beans.DicBean; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.views.CenterBaseInputView; +import com.tenlionsoft.baselib.core.widget.views.CenterGridPhoneListView; +import com.tenlionsoft.baselib.core.widget.views.GridTextAdapter; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; @@ -43,6 +58,8 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; +import okhttp3.MediaType; +import okhttp3.RequestBody; /** * 人口基础信息搜索 @@ -67,38 +84,44 @@ public class CensusBaseSearchActivity extends BaseActivity { TextView mTvBaseGrid; @BindView(R2.id.tv_base_name) TextView mTvBaseName;//姓名 - @BindView(R2.id.tv_base_former_name) - TextView mTvBaseFormerName;//曾用名 @BindView(R2.id.tv_base_gender) TextView mTvBaseGender;//性别 @BindView(R2.id.tv_base_id_card) TextView mTvBaseIdCard;//身份证 @BindView(R2.id.tv_base_phone) TextView mTvBasePhone;//联系电话 - @BindView(R2.id.tv_base_nation) - TextView mTvBaseNation;//名族 - @BindView(R2.id.tv_base_register_loc) - TextView mTvBaseRegisterLoc;//户籍地 - // @BindView(R2.id.tv_base_cur_loc) -// TextView mTvBaseCurLoc;//现住址 - @BindView(R2.id.tv_base_cur_address) - TextView mTvBaseCurAddress;//现住址详情 +// @BindView(R2.id.tv_base_nation) +// TextView mTvBaseNation;//民族 @BindView(R2.id.ll_person_info) LinearLayout mLlPersonInfo; @BindView(R2.id.btn_page_search) Button mBtnSearch; - @BindView(R2.id.btn_edit) - Button mBtnEdit; - - @BindView(R2.id.btn_detail) - Button mBtnDetail; - + @BindView(R2.id.rlv_grids) + RecyclerView mRlvGrid; + @BindView(R2.id.ll_edit) + LinearLayout mLlEdit; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + @BindView(R2.id.tv_type) + TextView mTvType; + @BindView(R2.id.tv_grid_hint) + TextView mTvGridHint; + @BindView(R2.id.btn_confirm) + Button mBtnSave; + @BindView(R2.id.tv_base_type) + TextView mTvBaseType; + @BindView(R2.id.tv_grids_list_hint) + TextView mTvGridsListHint; + private List mTypeList;//人口类型 private int mCurPage = 1; private CensusPersonAdapter mAdapter; + private OptionsPickerView mTypePicker; + private DicBean mSelTypeBean; private List mDatas = new ArrayList<>(); - + private OptionsPickerView mGridPicker; + private AreaGridListBean.RowsBean mSelGrid; private String mKeywords = ""; private @NonNull PersonSearchBean mBean; @@ -141,29 +164,115 @@ public class CensusBaseSearchActivity extends BaseActivity { }); mIvClear.setOnClickListener(v -> { mBean = null; + mLlEdit.setVisibility(View.GONE); mEtSearchCentent.setText(""); mTvBaseArea.setText(""); mTvBaseGrid.setText(""); mTvBaseName.setText(""); - mTvBaseFormerName.setText(""); mTvBaseGender.setText(""); mTvBaseIdCard.setText("");//身份证 mTvBasePhone.setText("");//联系电话 - mTvBaseNation.setText("");//名族 - mTvBaseRegisterLoc.setText("");//户籍地 - mTvBaseCurAddress.setText("");//现住址详情 setStateView(12); }); - mBtnEdit.setOnClickListener(v -> { - if (mBean != null && !TextUtils.isEmpty(mBean.getBasePopulationInfoId())) { - doEditBean(); - } - }); - mBtnDetail.setOnClickListener(v -> { - if (mBean != null && !TextUtils.isEmpty(mBean.getBasePopulationInfoId())) { - showDetail(); - } - }); +// mBtnEdit.setOnClickListener(v -> { +// if (mBean != null && !TextUtils.isEmpty(mBean.getBasePopulationInfoId())) { +// doEditBean(); +// } +// }); +// mBtnDetail.setOnClickListener(v -> { +// if (mBean != null && !TextUtils.isEmpty(mBean.getBasePopulationInfoId())) { +// showDetail(); +// } +// }); + mTypeList = new ArrayList<>(); + DicBean bean1 = new DicBean(); + bean1.setDataName("户籍人口"); + bean1.setDataId("1"); + + DicBean bean2 = new DicBean(); + bean2.setDataName("常住人口"); + bean2.setDataId("2"); + DicBean bean3 = new DicBean(); + bean3.setDataName("外来人口"); + bean3.setDataId("3"); + mTypeList.add(bean1); + mTypeList.add(bean2); + mTypeList.add(bean3); + mTvGrid.setOnClickListener(v -> onShowGrid()); + mTvType.setOnClickListener(v -> onShowType()); + mBtnSave.setOnClickListener(v -> doSaveEdit()); + getMineGridList(); + } + + private void doSaveEdit() { + if (checkParams()) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "修改中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(GridApis.class) + .doEditPopulaceInfo(mBean.getBasePopulationInfoId(), mSelTypeBean.getDataId(), + mSelGrid.getGridId(), UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("修改成功"); + setStateView(13); + doSearchPersonByIdCard(); + mBean = null; + mLlEdit.setVisibility(View.GONE); + mEtSearchCentent.setText(""); + mTvBaseArea.setText(""); + mTvBaseGrid.setText(""); + mTvBaseName.setText(""); + mTvBaseGender.setText(""); + mTvBaseIdCard.setText("");//身份证 + mTvBasePhone.setText("");//联系电话 + mSelGrid = null; + mSelTypeBean = null; + mTvGrid.setText(""); + mTvType.setText(""); + } + + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + } + + + /** + * 显示网格选择 + */ + private void onShowGrid() { + if (mGridPicker == null) { + mGridPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + mSelGrid = mGridList.get(o1); + mTvGrid.setText(mSelGrid.getGridName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mGridPicker.setPicker(mGridList); + } + mGridPicker.show(); } @Override @@ -176,13 +285,10 @@ public class CensusBaseSearchActivity extends BaseActivity { mTvBaseArea.setText(""); mTvBaseGrid.setText(""); mTvBaseName.setText(""); - mTvBaseFormerName.setText(""); mTvBaseGender.setText(""); mTvBaseIdCard.setText("");//身份证 mTvBasePhone.setText("");//联系电话 - mTvBaseNation.setText("");//名族 - mTvBaseRegisterLoc.setText("");//户籍地 - mTvBaseCurAddress.setText("");//现住址详情 + mLlEdit.setVisibility(View.GONE); setStateView(12); } } @@ -210,6 +316,7 @@ public class CensusBaseSearchActivity extends BaseActivity { setBaseInfo(personSearchBean); } else { setStateView(15); + showAddDialog(); } } @@ -226,6 +333,60 @@ public class CensusBaseSearchActivity extends BaseActivity { }); } + private void showAddDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); + builder.setTitle("提示") + .setMessage("该人员信息未搜索到,现在去新增吗?") + .setPositiveButton("确定", (dialog, which) -> { + dialog.dismiss(); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD) + .withString("title", "人口基础信息录入") + .withString("idCard",mEtSearchCentent.getText().toString().trim()) + .navigation(); + }) + .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) + .create() + .show(); + + } + + private List mGridList; + + private void getMineGridList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getMineGridList(UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@androidx.annotation.NonNull Disposable d) { + + } + + @Override + public void onNext(@androidx.annotation.NonNull List rowsBeans) { + if (rowsBeans.size() > 0) { + mGridList = rowsBeans; + if (rowsBeans.size() == 1) { + mSelGrid = rowsBeans.get(0); + mTvGrid.setText(mSelGrid.getGridName()); + } + } + } + + @Override + public void onError(@androidx.annotation.NonNull Throwable e) { + ExceptionHandler.handleException(e); + setStateView(16); + } + + @Override + public void onComplete() { + + } + }); + } private void onShowDelReason(CensusPersonBean.RowsBean bean, int pos) { CenterBaseInputView intputView = new CenterBaseInputView.DialogBuilder(mActivity).build(); @@ -298,6 +459,26 @@ public class CensusBaseSearchActivity extends BaseActivity { .navigation(); } + + /** + * 人口类型 + */ + private void onShowType() { + if (mTypePicker == null) { + mTypePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + mSelTypeBean = mTypeList.get(o1); + mTvType.setText(mSelTypeBean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mTypePicker.setPicker(mTypeList); + } + mTypePicker.show(); + } + /** * 显示详情 */ @@ -365,13 +546,111 @@ public class CensusBaseSearchActivity extends BaseActivity { mTvBaseArea.setText(mBaseInfo.getAreaNames()); mTvBaseGrid.setText(mBaseInfo.getGridName()); mTvBaseName.setText(mBaseInfo.getFullName()); - mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore()); mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName()); mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证 mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话 - mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族 - mTvBaseRegisterLoc.setText(mBaseInfo.getNativePlaceAddr());//户籍地 - mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情 + if (!TextUtils.isEmpty(mBaseInfo.getType())) { + switch (mBaseInfo.getType()) { + case "1": + mTvBaseType.setText("户籍人口"); + break; + case "2": + mTvBaseType.setText("常住人口"); + break; + case "3": + mTvBaseType.setText("外来人口"); + break; + } + } + if (mBaseInfo.getGridPersonList() != null && mBaseInfo.getGridPersonList().size() > 0) { + mRlvGrid.setVisibility(View.VISIBLE); + mTvGridsListHint.setVisibility(View.GONE); + GridTextAdapter adapter = new GridTextAdapter(mActivity, mBaseInfo.getGridPersonList()); + mRlvGrid.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvGrid.setAdapter(adapter); + adapter.addOnItemClickListener(gridPersonListBean -> { + if (!TextUtils.isEmpty(gridPersonListBean.getGridUserPhone())) { + doCall(gridPersonListBean.getGridUserPhone()); + } + }); + } else { + mTvGridsListHint.setVisibility(View.VISIBLE); + mRlvGrid.setVisibility(View.GONE); + } + //判断是自己网格 别人网格 无网格 + if (TextUtils.isEmpty(mBaseInfo.getGridId())) { + //无网格 + mLlEdit.setVisibility(View.VISIBLE); + mTvGridHint.setVisibility(View.GONE); + } else { + if (mGridList != null && mGridList.size() > 0) { + boolean flag = false; + for (int i = 0; i < mGridList.size(); i++) { + if (mGridList.get(i).getGridId().equals(mBaseInfo.getGridId())) { + flag = true; + break; + } + } + if (flag) { + //自己网格 + mLlEdit.setVisibility(View.VISIBLE); + mTvGridHint.setVisibility(View.GONE); + } else { + //别人 + mLlEdit.setVisibility(View.GONE); + mTvGridHint.setVisibility(View.VISIBLE); + mTvGridHint.setText("该人员已绑定至" + mBaseInfo.getAreaNames() + "/" + mBaseInfo.getGridName() + "下," + + "如绑定错误,请联系现在绑定的网格员进行解绑。"); + } + } else { + mTvGridHint.setVisibility(View.GONE); + mLlEdit.setVisibility(View.GONE); + } + } + + } + + private void doCall(String gridUserPhone) { + if (!TextUtils.isEmpty(gridUserPhone)) { + Intent intent = new Intent(Intent.ACTION_DIAL); + Uri data = Uri.parse("tel:" + gridUserPhone); + intent.setData(data); + startActivity(intent); + } + } + + + private boolean checkParams() { + if (mSelGrid == null) { + ToastUtils.show("请选择所属网格"); + return false; + } + if (mSelTypeBean == null) { + ToastUtils.show("请选择人员类型"); + return false; + } + return true; + } + + private RequestBody buildParams() { + SavePersonBean bean = new SavePersonBean(); + bean.setGridName(mSelGrid.getGridName()); + bean.setGridId(mSelGrid.getGridId()); + bean.setType(mSelTypeBean.getDataId()); + Gson gson = new Gson(); + String obj = gson.toJson(bean); + RequestBody requestBody = RequestBody.create(obj, MediaType.parse("application/json; charset=utf-8")); + return requestBody; + } + + /** + * 显示网格员电话列表 + */ + private void onShowGridPhone(List list) { + CenterGridPhoneListView intputView = new CenterGridPhoneListView.DialogBuilder(mActivity) + .setList(list) + .build(); + intputView.show(); } @Override diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java index d83aa8a..63c20a7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java @@ -2,6 +2,7 @@ package com.tengshisoft.gridmodule.incident.activitys.populace; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Intent; import android.graphics.Color; import android.text.TextUtils; import android.view.View; @@ -9,9 +10,11 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -20,13 +23,16 @@ 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.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; +import com.tengshisoft.commonmodule.views.ConditionAreaGridPopup; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.views.CenterBaseInputView; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; @@ -67,6 +73,10 @@ public class CensusExitrActivity extends BaseActivity { EditText mEtSearchCentent; @BindView(R2.id.iv_clear) ImageView mIvClear; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + @BindView(R2.id.ll_grid) + LinearLayout mLlGrid; private Unbinder mBind; private int mCurPage = 1; private CensusPersonAdapter mAdapter; @@ -131,7 +141,7 @@ public class CensusExitrActivity extends BaseActivity { }); refreshView(STATE_LOAD_SUCCESS); setStateView(13); - refreshData(); + getMineGridList(); mEtSearchCentent.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) { @@ -163,7 +173,7 @@ public class CensusExitrActivity extends BaseActivity { mKeywords = ""; refreshData(); }); - + mTvGrid.setOnClickListener(v -> onShowGrid()); } @@ -255,7 +265,7 @@ public class CensusExitrActivity extends BaseActivity { .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD) .withString("title", "人口基础信息编辑") .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity,12); } /** @@ -267,7 +277,88 @@ public class CensusExitrActivity extends BaseActivity { ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_DETAIL) .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity,12); + } + + + private List mGridList; + private AreaGridListBean.RowsBean mSelGrid; + + /** + * 选择网格 + */ + private void onShowGrid() { + ConditionAreaGridPopup conditionPopup = new ConditionAreaGridPopup(mActivity, mGridList); + conditionPopup.setOnListPopupItemClickListener((bean, isCheck, pos) -> { + if (isCheck) { + //选中了 + mSelGrid = bean; + mTvGrid.setText(mSelGrid.getGridName()); + } else { + //清除了选项 + mSelGrid = null; + mTvGrid.setText("网格"); + } + refreshData(); + conditionPopup.dismiss(); + }); + conditionPopup.showPopupWindow(mTvGrid); + } + + + private void getMineGridList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getMineGridList(UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@androidx.annotation.NonNull Disposable d) { + + } + + @Override + public void onNext(@androidx.annotation.NonNull List rowsBeans) { + if (rowsBeans.size() > 0) { + mGridList = rowsBeans; + mSelGrid = mGridList.get(0); + if (mGridList.size() > 1) { + mGridList.get(0).setCheck(true); + mLlGrid.setVisibility(View.VISIBLE); + mTvGrid.setText(mSelGrid.getGridName()); + } else { + mLlGrid.setVisibility(View.GONE); + } + refreshData(); + } else { + mLlGrid.setVisibility(View.GONE); + ToastUtils.show("您暂未分配网格"); + setStateView(15); + } + } + + @Override + public void onError(@androidx.annotation.NonNull Throwable e) { + ExceptionHandler.handleException(e); + setStateView(16); + } + + @Override + public void onComplete() { + + } + }); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if (requestCode == 12) { + if (resultCode == 13) { + refreshData(); + } + } + super.onActivityResult(requestCode, resultCode, data); } /** @@ -281,6 +372,7 @@ public class CensusExitrActivity extends BaseActivity { } private void refreshData() { + setStateView(13); getUpcomingList(1, null); } @@ -296,7 +388,7 @@ public class CensusExitrActivity extends BaseActivity { mCurPage = page; RetrofitManager.getInstance() .create(GridApis.class) - .getBaseInfoList(page + "", mKeywords, "3", UserLgUtils.getToken()) + .getBaseInfoList(mSelGrid ==null? "":mSelGrid.getGridId(),page + "", mKeywords, "3", UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java index 6c588d1..34650bc 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java @@ -2,6 +2,7 @@ package com.tengshisoft.gridmodule.incident.activitys.populace; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Intent; import android.graphics.Color; import android.text.TextUtils; import android.view.View; @@ -9,9 +10,11 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -20,13 +23,16 @@ 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.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; +import com.tengshisoft.commonmodule.views.ConditionAreaGridPopup; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.views.CenterBaseInputView; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; @@ -67,6 +73,10 @@ public class CensusResidsActivity extends BaseActivity { EditText mEtSearchCentent; @BindView(R2.id.iv_clear) ImageView mIvClear; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + @BindView(R2.id.ll_grid) + LinearLayout mLlGrid; private Unbinder mBind; private int mCurPage = 1; private CensusPersonAdapter mAdapter; @@ -99,7 +109,7 @@ public class CensusResidsActivity extends BaseActivity { @Override public void initData() { mBind = ButterKnife.bind(this); - mTvBaseTitle.setText("外来人口"); + mTvBaseTitle.setText("常住人口"); mTvPublish.setVisibility(View.VISIBLE); mIvAppSearchIcon.setVisibility(View.VISIBLE); mTvPublish.setText("新增"); @@ -131,7 +141,7 @@ public class CensusResidsActivity extends BaseActivity { }); refreshView(STATE_LOAD_SUCCESS); setStateView(13); - refreshData(); + getMineGridList(); mEtSearchCentent.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) { @@ -163,7 +173,7 @@ public class CensusResidsActivity extends BaseActivity { mKeywords = ""; refreshData(); }); - + mTvGrid.setOnClickListener(v -> onShowGrid()); } @@ -255,7 +265,7 @@ public class CensusResidsActivity extends BaseActivity { .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD) .withString("title", "人口基础信息编辑") .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity, 12); } /** @@ -267,7 +277,7 @@ public class CensusResidsActivity extends BaseActivity { ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_DETAIL) .withString("id", bean.getBasePopulationInfoId()) - .navigation(); + .navigation(mActivity, 12); } /** @@ -281,6 +291,7 @@ public class CensusResidsActivity extends BaseActivity { } private void refreshData() { + setStateView(13); getUpcomingList(1, null); } @@ -289,6 +300,86 @@ public class CensusResidsActivity extends BaseActivity { super.onResume(); } + private List mGridList; + private AreaGridListBean.RowsBean mSelGrid; + + /** + * 选择网格 + */ + private void onShowGrid() { + ConditionAreaGridPopup conditionPopup = new ConditionAreaGridPopup(mActivity, mGridList); + conditionPopup.setOnListPopupItemClickListener((bean, isCheck, pos) -> { + if (isCheck) { + //选中了 + mSelGrid = bean; + mTvGrid.setText(mSelGrid.getGridName()); + } else { + //清除了选项 + mSelGrid = null; + mTvGrid.setText("网格"); + } + refreshData(); + conditionPopup.dismiss(); + }); + conditionPopup.showPopupWindow(mTvGrid); + } + + + private void getMineGridList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getMineGridList(UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@androidx.annotation.NonNull Disposable d) { + + } + + @Override + public void onNext(@androidx.annotation.NonNull List rowsBeans) { + if (rowsBeans.size() > 0) { + mGridList = rowsBeans; + mSelGrid = mGridList.get(0); + if (mGridList.size() > 1) { + mGridList.get(0).setCheck(true); + mLlGrid.setVisibility(View.VISIBLE); + mTvGrid.setText(mSelGrid.getGridName()); + } else { + mLlGrid.setVisibility(View.GONE); + } + refreshData(); + } else { + mLlGrid.setVisibility(View.GONE); + ToastUtils.show("您暂未分配网格"); + setStateView(15); + } + } + + @Override + public void onError(@androidx.annotation.NonNull Throwable e) { + ExceptionHandler.handleException(e); + setStateView(16); + } + + @Override + public void onComplete() { + + } + }); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if (requestCode == 12) { + if (resultCode == 13) { + refreshData(); + } + } + super.onActivityResult(requestCode, resultCode, data); + } + /** * 获取列表 */ @@ -296,7 +387,8 @@ public class CensusResidsActivity extends BaseActivity { mCurPage = page; RetrofitManager.getInstance() .create(GridApis.class) - .getBaseInfoList(page + "", mKeywords, "2", UserLgUtils.getToken()) + .getBaseInfoList(mSelGrid == null ? "" : mSelGrid.getGridId(), page + "", mKeywords, "2", + UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java index 7384f04..b5477ee 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java @@ -233,6 +233,8 @@ public class CensusYoungListActivity extends BaseActivity { @Override public void onNext(CensusYoungListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { @@ -252,7 +254,7 @@ public class CensusYoungListActivity extends BaseActivity { mSrlContent.setNoMoreData(false); } } else { - mSrlContent.finishLoadMore(); + mSrlContent.setNoMoreData(true); if (page > 1) { refreshView(STATE_LOAD_SUCCESS); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java index 723cd07..3687c5c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java @@ -172,6 +172,8 @@ public class YoungCaseListActivity extends BaseActivity { @Override public void onNext(@NonNull YoungCaseListBean communityListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (mDialog != null && mDialog.isShowing()) { mDialog.dismiss(); } diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java index 7aefce9..199cb63 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java @@ -236,6 +236,8 @@ public class CensusMigrantListActivity extends BaseActivity { @Override public void onNext(MigrantListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java index c020a1e..8778ca3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java @@ -231,6 +231,8 @@ public class CensusRearListActivity extends BaseActivity { @Override public void onNext(RearListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java index 1cfdcc7..b7524ef 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java @@ -235,6 +235,8 @@ public class CensusRegisterListActivity extends BaseActivity { @Override public void onNext(CensusRegisterListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java index 0969fcd..8b6084d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java @@ -236,6 +236,8 @@ public class CensusOutboundListActivity extends BaseActivity { @Override public void onNext(OutboundListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java index bfcfd6f..6772e3f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java @@ -237,6 +237,8 @@ public class CensusAidsListActivity extends BaseActivity { @Override public void onNext(CensusAidsListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java index 140bf3b..06acd28 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java @@ -237,6 +237,8 @@ public class CensusCorrctListActivity extends BaseActivity { @Override public void onNext(CensusCorrectListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java index 4c9763f..3e56aa1 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java @@ -234,6 +234,8 @@ public class CensusDrugListActivity extends BaseActivity { @Override public void onNext(CensusDrugListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java index 4002c5d..d11b525 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java @@ -237,6 +237,8 @@ public class CensusSpecialCriminalListActivity extends BaseActivity { @Override public void onNext(CensusCriminalListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java index ab8155f..94950da 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java @@ -234,6 +234,8 @@ public class CensusTroubleListActivity extends BaseActivity { @Override public void onNext(CensusTroubleListBean leaveListBean) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) { ++mCurPage; if (page == 1) { diff --git a/gridmodule/src/main/res/layout/activity_census_base.xml b/gridmodule/src/main/res/layout/activity_census_base.xml index dfe1577..186a7a6 100644 --- a/gridmodule/src/main/res/layout/activity_census_base.xml +++ b/gridmodule/src/main/res/layout/activity_census_base.xml @@ -31,62 +31,104 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="vertical"> + + + + + + + + + - - + android:background="@drawable/shp_rectangle_white_01" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + +