签到页面、矛盾纠纷

app/src/main/AndroidManifest.xml

@@ -48,6 +48,22 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name=".activitys.census.special.CensusDisputeDetailActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            tools:ignore="LockedOrientationActivity" />
+        <activity
+            android:name=".activitys.census.special.CensusDisputeAddActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            tools:ignore="LockedOrientationActivity" />
+        <activity
+            android:name=".activitys.census.special.CensusDisputeListActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            tools:ignore="LockedOrientationActivity" />
+
         <activity
             android:name=".activitys.census.special.CensusPetitionDetailActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/base/LoginActivity.java

@@ -155,7 +155,7 @@ public class LoginActivity extends BaseActivity {
         refreshLoginState(11);
         hideSoftKeyboard();
         String deviceId = getDeviceId();
-        GlobalProvider.save(mActivity, "isHolday", "jiaqi");
+//        GlobalProvider.save(mActivity, "isHolday", "jiaqi");
         if (TextUtils.isEmpty(deviceId)) {
             ToastUtils.showShort("请授权手机设置中读取文件的权限");
             return;

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/base/MainActivity.java

@@ -72,6 +72,7 @@ import com.sucstepsoft.realtimelocation.activitys.mine.UserActivity;
 import com.sucstepsoft.realtimelocation.activitys.mine.WorkLogActivity;
 import com.sucstepsoft.realtimelocation.activitys.notice.NoticeActivity;
 import com.sucstepsoft.realtimelocation.adapters.FunctionNumAdapter;
+import com.sucstepsoft.realtimelocation.adapters.NewNoticeAdapter;
 import com.sucstepsoft.realtimelocation.adapters.NoticeAdapter;
 import com.sucstepsoft.realtimelocation.beans.AppTokenUser;
 import com.sucstepsoft.realtimelocation.beans.BaseUserBean;
@@ -151,6 +152,8 @@ public class MainActivity extends BaseActivity {
     RecyclerView mRlvNotice;
     @BindView(R.id.csv_notice)
     CustomStateView mCsvNotice;
+    @BindView(R.id.rl_notice)
+    RelativeLayout mRlNotice;
 
 
     private String[] permissions = new String[]{
@@ -196,7 +199,7 @@ public class MainActivity extends BaseActivity {
     private LocationClient mLocationClient;
 
     private List<NewsListBean.RowsBean> mDatas;
-    private NoticeAdapter mAdapter;
+    private NewNoticeAdapter mAdapter;
 
     @Override
     protected int setLayoutId() {
@@ -224,7 +227,7 @@ public class MainActivity extends BaseActivity {
             }
         }).request();
         initBaseView();
-//        getUserPenList();
+
         registerGpsSignal();
         registerGpsState();
         getNoticeList();
@@ -516,6 +519,7 @@ public class MainActivity extends BaseActivity {
     private void initBaseView() {
         mGson = new Gson();
         String loginInfo = UserLgUtils.getLoginInfo();
+        LogUtils.e("登录信息:" + loginInfo);
         if (!TextUtils.isEmpty(loginInfo)) {
             AppTokenUser appTokenUser = mGson.fromJson(loginInfo, AppTokenUser.class);
             if (appTokenUser.getRoles() != null && appTokenUser.getRoles().size() > 0) {
@@ -546,7 +550,7 @@ public class MainActivity extends BaseActivity {
                         .placeholder(R.drawable.ic_user_default))
                 .into(mIvUserIcon);
         mDatas = new ArrayList<>();
-        mAdapter = new NoticeAdapter(mActivity, mDatas);
+        mAdapter = new NewNoticeAdapter(mActivity, mDatas);
         mRlvNotice.setLayoutManager(new LinearLayoutManager(mActivity));
         mRlvNotice.setAdapter(mAdapter);
         mCsvNotice.setOnClickListener(v -> {
@@ -1299,6 +1303,7 @@ public class MainActivity extends BaseActivity {
             R.id.ll_user_center,
             R.id.ll_day_aviso,
             R.id.ll_address_list,
+            R.id.rl_notice,
             R.id.ll_case_record})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -1317,6 +1322,9 @@ public class MainActivity extends BaseActivity {
                 intent.putExtra("type", "type");
                 startActivity(intent);
                 break;
+            case R.id.rl_notice:
+                startActivity(new Intent(MainActivity.this, NoticeActivity.class));
+                break;
             case R.id.ll_user_center://个人中心
                 startActivity(new Intent(MainActivity.this, UserActivity.class));
                 break;
@@ -1389,7 +1397,6 @@ public class MainActivity extends BaseActivity {
     protected void onStart() {
         super.onStart();
         isForeground = true;
-        checkAmSign();
         if (mSignTimeBean != null) {
             Intent intent = new Intent();
             intent.setAction(PathConfig.ACTION_PUNCH_TIME_MESSAGE);

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

@@ -13,6 +13,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusCorrctListActivity;
+import com.sucstepsoft.realtimelocation.activitys.census.special.CensusDisputeListActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusDrugListActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusHeresyListActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusPetitionListActivity;
@@ -254,6 +255,8 @@ public class CensusRegisterDetailActivity extends BaseActivity {
                     startActivity(intent);
                     break;
                 case "3"://矛盾纠纷
+                    intent.setClass(mActivity, CensusDisputeListActivity.class);
+                    startActivity(intent);
                     break;
                 case "4"://社会治安
                     intent.setClass(mActivity, CensusSecurityListActivity.class);

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

@@ -0,0 +1,395 @@
+package com.sucstepsoft.realtimelocation.activitys.census.special;
+
+import android.content.Intent;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+import android.widget.TextView;
+import android.widget.ZoomControls;
+
+import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.BitmapDescriptor;
+import com.baidu.mapapi.map.BitmapDescriptorFactory;
+import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
+import com.baidu.mapapi.map.MapStatusUpdateFactory;
+import com.baidu.mapapi.map.MarkerOptions;
+import com.baidu.mapapi.map.OverlayOptions;
+import com.baidu.mapapi.map.TextureMapView;
+import com.baidu.mapapi.model.LatLng;
+import com.sucstepsoft.cm_utils.constant.PathConfig;
+import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean;
+import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
+import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
+import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.utils.UserLgUtils;
+import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.activitys.common.PhotoActivity;
+import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.DisputeDetailBean;
+import com.sucstepsoft.realtimelocation.net.LocationApiService;
+import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.Observable;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 矛盾纠纷
+ */
+public class CensusDisputeDetailActivity extends BaseActivity {
+
+
+    @BindView(R.id.et_search_id_card)
+    EditText mEtSearchIdCard;
+    @BindView(R.id.iv_clear)
+    ImageView mIvClear;
+    @BindView(R.id.btn_search)
+    Button mBtnSearch;
+    @BindView(R.id.ll_search_content)
+    LinearLayout mLlSearchContent;
+    @BindView(R.id.tv_base_name)
+    TextView mTvBaseName;
+    @BindView(R.id.tv_base_gender)
+    TextView mTvBaseGender;
+    @BindView(R.id.tv_base_phone)
+    TextView mTvBasePhone;
+    @BindView(R.id.tv_base_native)
+    TextView mTvBaseNative;
+    @BindView(R.id.tv_base_cur_loc)
+    TextView mTvBaseCurLoc;
+    @BindView(R.id.cv_base_info)
+    LinearLayout mCvBaseInfo;
+    @BindView(R.id.tv_case_name)
+    TextView mTvCaseName;
+    @BindView(R.id.tv_case_title)
+    TextView mTvCaseTitle;
+    @BindView(R.id.tv_case_date)
+    TextView mTvCaseDate;
+    @BindView(R.id.tv_case_address)
+    TextView mTvCaseAddress;
+    @BindView(R.id.tv_detail_address)
+    TextView mTvDetailAddress;
+    @BindView(R.id.tv_loc_lng)
+    TextView mTvLocLng;
+    @BindView(R.id.mp_view)
+    TextureMapView mMpView;
+    @BindView(R.id.tv_point)
+    TextView mTvPoint;
+    @BindView(R.id.tv_case_scale)
+    TextView mTvCaseScale;
+    @BindView(R.id.tv_case_type)
+    TextView mTvCaseType;
+    @BindView(R.id.tv_case_assess)
+    TextView mTvCaseAssess;
+    @BindView(R.id.tv_case_degree)
+    TextView mTvCaseDegree;
+    @BindView(R.id.tv_case_level)
+    TextView mTvCaseLevel;
+    @BindView(R.id.tv_dispute_type)
+    TextView mTvDisputeType;
+    @BindView(R.id.tv_dispute_level)
+    TextView mTvDisputeLevel;
+    @BindView(R.id.tv_risk_type)
+    TextView mTvRiskType;
+    @BindView(R.id.tv_risk_level)
+    TextView mTvRiskLevel;
+    @BindView(R.id.tv_money)
+    TextView mTvMoney;
+    @BindView(R.id.tv_person_num)
+    TextView mTvPersonNum;
+    @BindView(R.id.tv_dept)
+    TextView mTvDept;
+    @BindView(R.id.tv_compose_date)
+    TextView mTvComposeDate;
+    @BindView(R.id.tv_reason_other)
+    TextView mTvReasonOther;
+    @BindView(R.id.rlv_photo)
+    RecyclerView mRlvPhoto;
+    @BindView(R.id.tv_party_card_type)
+    TextView mTvPartyCardType;
+    @BindView(R.id.tv_party_card_num)
+    TextView mTvPartyCardNum;
+    @BindView(R.id.tv_party_name)
+    TextView mTvPartyName;
+    @BindView(R.id.tv_party_phone)
+    TextView mTvPartyPhone;
+    @BindView(R.id.tv_party_sex)
+    TextView mTvPartySex;
+    @BindView(R.id.tv_party_nation)
+    TextView mTvPartyNation;
+    @BindView(R.id.tv_party_edu)
+    TextView mTvPartyEdu;
+    @BindView(R.id.tv_party_person_type)
+    TextView mTvPartyPersonType;
+    @BindView(R.id.tv_party_person_address)
+    TextView mTvPartyPersonAddress;
+    @BindView(R.id.tv_resolve_date)
+    TextView mTvResolveDate;
+    @BindView(R.id.tv_resolve_way)
+    TextView mTvResolveWay;
+    @BindView(R.id.tv_resolve_dept)
+    TextView mTvResolveDept;
+    @BindView(R.id.tv_resolve_name)
+    TextView mTvResolveName;
+    @BindView(R.id.tv_resolve_id_card)
+    TextView mTvResolveIdCard;
+    @BindView(R.id.tv_resolve_phone)
+    TextView mTvResolvePhone;
+    @BindView(R.id.sw_is_resolve)
+    Switch mSwIsResolve;
+    @BindView(R.id.tv_resolve_result)
+    TextView mTvResolveResult;
+    @BindView(R.id.tv_eva_advice)
+    TextView mTvEvaAdvice;
+    @BindView(R.id.tv_eva_date)
+    TextView mTvEvaDate;
+    @BindView(R.id.tv_measure)
+    TextView mTvMeasure;
+    @BindView(R.id.tv_work_record)
+    TextView mTvWorkRecord;
+    @BindView(R.id.tv_party_b_num)
+    TextView mTvPartyBNum;
+    @BindView(R.id.tv_party_b_name)
+    TextView mTvPartyBName;
+    @BindView(R.id.tv_party_b_phone)
+    TextView mTvPartyBPhone;
+    @BindView(R.id.ll_content)
+    LinearLayout mLlContent;
+    private Unbinder mBind;
+    private BaseRegisterDetailBean mBaseInfo;
+    private DisputeDetailBean bean;
+    private BaiduMap mBaiduMap;
+    private LatLng mDefaultPoint;
+    private BitmapDescriptor mBitmapDescriptor;
+    private List<AddPhotoBean> mPhotos = new ArrayList<>();
+    private AddPhotoBean mCurrentBean;
+    private String mPicPath;
+    private String mPhotoIds = "";//相片Id
+    private AddPhotoAdapter mPhotoAdapter;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_census_dispute_detail;
+    }
+
+    @Override
+    public void initData() {
+        mBind = ButterKnife.bind(this);
+        mTvBaseTitle.setText("详情");
+        refreshView(STATE_LOAD_LOADING);
+        String id = getIntent().getStringExtra("id");
+        String idCard = getIntent().getStringExtra("idCard");
+        mPhotoAdapter = new AddPhotoAdapter(CensusDisputeDetailActivity.this, mPhotos);
+        mRlvPhoto.setLayoutManager(new GridLayoutManager(mActivity, 4));
+        mRlvPhoto.setAdapter(mPhotoAdapter);
+        mPhotoAdapter.addOnItemClickListener(bean -> {
+            if (TextUtils.isEmpty(bean.getPath())) {
+                //空数据
+
+            } else {
+                //预览
+                ArrayList<String> list = new ArrayList<>();
+                list.add(bean.getPath());
+                Intent intent = new Intent();
+                intent.putExtra(PhotoActivity.TAG_IMGURL, list);
+                intent.setClass(CensusDisputeDetailActivity.this, PhotoActivity.class);
+                startActivity(intent);
+            }
+        });
+        initBaiduMap();
+        getDetailData(id, idCard);
+    }
+
+    /**
+     * 获取详细信息
+     *
+     * @param id
+     * @param idCard
+     */
+    private void getDetailData(String id, String idCard) {
+        Observable<BaseRegisterDetailBean> baseRegisterDetail = RetrofitManager.getInstance().create(LocationApiService.class).getBaseRegisterDetail(idCard, UserLgUtils.getToken());
+        Observable<DisputeDetailBean> securityDetailById = RetrofitManager.getInstance().create(LocationApiService.class).getDisputeDetailById(id, UserLgUtils.getToken());
+        Observable.merge(baseRegisterDetail, securityDetailById)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<Object>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(@NonNull Object o) {
+                        if (o instanceof BaseRegisterDetailBean) {
+                            mBaseInfo = (BaseRegisterDetailBean) o;
+                            setBaseInfo();
+                        } else if (o instanceof DisputeDetailBean) {
+                            bean = (DisputeDetailBean) o;
+                            setDataToView();
+                        }
+                        refreshView(STATE_LOAD_SUCCESS);
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        ExceptionHandler.handleException(e);
+                        refreshView(STATE_LOAD_ERROR);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+
+    }
+
+    /**
+     * 基础信息
+     */
+    private void setBaseInfo() {
+        mTvBaseName.setText(mBaseInfo.getName());
+        mTvBaseGender.setText(mBaseInfo.getSex());
+        mTvBasePhone.setText(mBaseInfo.getPhone());
+        mTvBaseNative.setText(mBaseInfo.getOriginAddress());
+        mTvBaseCurLoc.setText(mBaseInfo.getDomicileAreaName() + "/" + mBaseInfo.getDomicileAddress());
+    }
+
+    private void initBaiduMap() {
+        mDefaultPoint = new LatLng(PathConfig.LA, PathConfig.LO);
+        mBaiduMap = mMpView.getMap();
+        MapStatus ms = new MapStatus.Builder().zoom(14).target(mDefaultPoint).build();
+        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(ms);
+        View child = mMpView.getChildAt(1);
+        if (child != null && (child instanceof ImageView || child instanceof ZoomControls)) {
+            child.setVisibility(View.GONE);
+        }
+        mMpView.showZoomControls(false);
+        mBaiduMap.animateMapStatus(u);
+    }
+
+    /**
+     * 详细信息
+     */
+    private void setDataToView() {
+        mTvCaseName.setText(bean.getCaseName());
+        mTvCaseTitle.setText(bean.getCaseTitle());
+        mTvCaseDate.setText(bean.getCaseTime());
+        mTvCaseAddress.setText(bean.getCaseAddress());
+        mTvDetailAddress.setText(bean.getCaseMapAddress());
+        if (!TextUtils.isEmpty(bean.getCaseLat()) && !TextUtils.isEmpty(bean.getCaseLng())) {
+            Double lat = Double.parseDouble(bean.getCaseLat());
+            Double lng = Double.parseDouble(bean.getCaseLng());
+            addMarker(new LatLng(lat, lng));
+            mTvPoint.setText("经纬度:" + bean.getCaseLat() + "-" + bean.getCaseLng());
+        }
+        if (!TextUtils.isEmpty(bean.getCaseScale())) {
+            mTvCaseScale.setText(bean.getCaseScaleName());
+        }
+        if (!TextUtils.isEmpty(bean.getCaseType())) {
+            mTvCaseType.setText(bean.getCaseTypeName());
+        }
+        if (!TextUtils.isEmpty(bean.getCaseEstimate())) {
+            mTvCaseAssess.setText(bean.getCaseEstimateName());
+        }
+        if (!TextUtils.isEmpty(bean.getCaseDegree())) {
+            mTvCaseDegree.setText(bean.getCaseDegreeName());
+        }
+        if (!TextUtils.isEmpty(bean.getCaseLevel())) {
+            mTvCaseLevel.setText(bean.getCaseLevelName());
+        }
+        if (!TextUtils.isEmpty(bean.getDisputeType())) {
+            mTvDisputeType.setText(bean.getDisputeTypeName());
+        }
+        if (!TextUtils.isEmpty(bean.getDisputeLevel())) {
+            mTvDisputeLevel.setText(bean.getDisputeLevelName());
+        }
+        if (!TextUtils.isEmpty(bean.getRiskType())) {
+            mTvRiskType.setText(bean.getRiskTypeName());
+        }
+
+        if (!TextUtils.isEmpty(bean.getRiskLevel())) {
+            mTvRiskLevel.setText(bean.getRiskLevelName());
+        }
+
+        mTvMoney.setText(bean.getDisputeMoney());
+        mTvPersonNum.setText(bean.getDisputeNumber());
+        mTvDept.setText(bean.getDisputeOrganization());
+        mTvComposeDate.setText(bean.getMediateLastTime());
+        mTvReasonOther.setText(bean.getCaseDescription());
+        if (!TextUtils.isEmpty(bean.getCaseImages())) {
+            String[] photos = bean.getCaseImages().split(",");
+            mPhotos.clear();
+            for (int i = 0; i < photos.length; i++) {
+                AddPhotoBean pBean = new AddPhotoBean();
+                pBean.setId(photos[i]);
+                pBean.setPath(BaseUrlApi.BASE_IMG_URL + photos[i]);
+                mPhotos.add(pBean);
+            }
+            mPhotoAdapter.setData(mPhotos);
+        }
+        mTvPartyCardType.setText(bean.getPartyIdcardType());
+        mTvPartyCardNum.setText(bean.getPartyIdcard());
+        mTvPartyName.setText(bean.getPartyName());
+        mTvPartyPhone.setText(bean.getPartyPhone());
+        mTvPartySex.setText(bean.getPartySex());
+        mTvPartyNation.setText(bean.getPartyNation());
+        mTvPartyEdu.setText(bean.getPartyEducation());
+        mTvPartyPersonType.setText(bean.getPartyType());
+        mTvPartyPersonAddress.setText(bean.getPartyAddress());
+        mTvResolveDate.setText(bean.getDefuseTime());
+        if (!TextUtils.isEmpty(bean.getDefuseWay())) {
+            mTvResolveWay.setText(bean.getDefuseWayName());
+        }
+        mTvResolveDept.setText(bean.getDefuseOrganization());
+        mTvResolveName.setText(bean.getDefuseResponsibleName());
+        mTvResolveIdCard.setText(bean.getDefuseResponsibleIdcard());
+        mTvResolvePhone.setText(bean.getDefuseResponsiblePhone());
+        mSwIsResolve.setChecked("是".equals(bean.getDefuseStatus()));
+        mTvResolveResult.setText(bean.getDefuseDescription());
+        mTvEvaAdvice.setText(bean.getEvaluationOpinion());
+        mTvEvaDate.setText(bean.getEvaluationTime());
+        mTvMeasure.setText(bean.getMeasureDescription());
+        mTvWorkRecord.setText(bean.getRecordDescription());
+        mTvPartyBNum.setText(bean.getPartybIdcard());
+        mTvPartyBPhone.setText(bean.getPartybPhone());
+        mTvPartyBName.setText(bean.getPartybName());
+        refreshView(STATE_LOAD_SUCCESS);
+    }
+
+    /**
+     * 添加marker
+     *
+     * @param latLng
+     */
+    private void addMarker(LatLng latLng) {
+        mBaiduMap.clear();
+        mBitmapDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.ic_map_marker);
+        OverlayOptions option = new MarkerOptions()
+                .position(latLng)
+                .icon(mBitmapDescriptor)
+                .animateType(MarkerOptions.MarkerAnimateType.drop);
+        mBaiduMap.addOverlay(option);
+        MapStatus ms = new MapStatus.Builder().zoom(14).target(latLng).build();
+        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(ms);
+        mBaiduMap.animateMapStatus(u);
+    }
+
+}

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

@@ -0,0 +1,271 @@
+package com.sucstepsoft.realtimelocation.activitys.census.special;
+
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.utils.ToastUtils;
+import com.sucstepsoft.cm_utils.utils.UIUtil;
+import com.sucstepsoft.cm_utils.utils.UserLgUtils;
+import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.adapters.CorrectDisputeAdapter;
+import com.sucstepsoft.realtimelocation.beans.SuccessBean;
+import com.sucstepsoft.realtimelocation.beans.person.DisputeBean;
+import com.sucstepsoft.realtimelocation.beans.person.PetitionBean;
+import com.sucstepsoft.realtimelocation.net.LocationApiService;
+import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 矛盾
+ */
+public class CensusDisputeListActivity extends BaseActivity {
+    @BindView(R.id.xlv_content)
+    XRecyclerView mXlvItems;
+    private Unbinder mBind;
+    private String mRows = "20";
+    private int mCurPage = 1;
+    private CorrectDisputeAdapter mAdapter;
+    private List<DisputeBean.RowsBean> mDatas = new ArrayList<>();
+    private Disposable mDisposable;
+
+
+    private String mKeywords = "";
+    private String mId;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_census_dispute_list;
+    }
+
+    @Override
+    public void initData() {
+        mBind = ButterKnife.bind(this);
+        mTvBaseTitle.setText("矛盾纠纷");
+        mTvPublish.setVisibility(View.VISIBLE);
+        mTvPublish.setText("新增");
+        mId = getIntent().getStringExtra("idCard");
+        mTvPublish.setOnClickListener(v -> {
+            Intent intent = new Intent(mActivity, CensusDisputeAddActivity.class);
+            intent.putExtra("title", "矛盾纠纷信息录入");
+            intent.putExtra("idCard", mId);
+            startActivity(intent);
+        });
+
+        mAdapter = new CorrectDisputeAdapter(mActivity, mDatas);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
+        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        mXlvItems.setLayoutManager(layoutManager);
+        mXlvItems.setAdapter(mAdapter);
+        mAdapter.addOnItemClickListener(bean -> showDetail(bean));
+        mXlvItems.setRefreshProgressStyle(ProgressStyle.BallGridBeat);
+        mXlvItems.setLoadingMoreProgressStyle(ProgressStyle.Pacman);
+        mXlvItems.setPullRefreshEnabled(true);
+        mXlvItems.setLoadingMoreEnabled(true);
+        mXlvItems.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                refreshData();
+            }
+
+            @Override
+            public void onLoadMore() {
+                getUpcomingList(mCurPage);
+            }
+        });
+        mAdapter.addOnEditListener(new CorrectDisputeAdapter.OnEditListener() {
+            @Override
+            public void onDel(DisputeBean.RowsBean bean, int pos) {
+                doDelBean(bean, pos);
+            }
+
+            @Override
+            public void onEdit(DisputeBean.RowsBean bean, int pos) {
+                doEditBean(bean, pos);
+            }
+        });
+    }
+
+
+    /**
+     * 删除数据
+     *
+     * @param bean
+     * @param pos
+     */
+    private void doDelBean(DisputeBean.RowsBean bean, int pos) {
+        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(LocationApiService.class)
+                            .doDelDispute(bean.getDisputeId(), UserLgUtils.getToken())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new Observer<SuccessBean>() {
+                                @Override
+                                public void onSubscribe(@NonNull Disposable d) {
+
+                                }
+
+                                @Override
+                                public void onNext(@NonNull SuccessBean successBean) {
+                                    ToastUtils.showShort("删除成功");
+                                    mDatas.remove(bean);
+                                    mAdapter.notifyDataSetChanged();
+                                    dialog1.dismiss();
+                                }
+
+                                @Override
+                                public void onError(@NonNull Throwable e) {
+                                    dialog1.dismiss();
+                                    ExceptionHandler.handleException(e);
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                })
+                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+                .create()
+                .show();
+    }
+
+    /**
+     * 编辑数据
+     *
+     * @param bean
+     * @param pos
+     */
+    private void doEditBean(DisputeBean.RowsBean bean, int pos) {
+        Intent intent = new Intent(mActivity, CensusDisputeAddActivity.class);
+        intent.putExtra("title", "矛盾纠纷信息编辑");
+        intent.putExtra("id", bean.getDisputeId());
+        intent.putExtra("idCard", bean.getPartyPopulationInfoId());
+        startActivity(intent);
+    }
+
+    /**
+     * 显示详情
+     *
+     * @param bean
+     */
+    private void showDetail(DisputeBean.RowsBean bean) {
+        Intent intent = new Intent(mActivity, CensusDisputeDetailActivity.class);
+        intent.putExtra("id", bean.getDisputeId());
+        intent.putExtra("idCard", bean.getPartyPopulationInfoId());
+        startActivity(intent);
+    }
+
+    private void refreshData() {
+        getUpcomingList(1);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshData();
+    }
+
+    /**
+     * 获取列表
+     */
+    private void getUpcomingList(int page) {
+        mCurPage = page;
+        RetrofitManager.getInstance()
+                .create(LocationApiService.class)
+                .getDisputeList(mId, page + "", mKeywords, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<DisputeBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(DisputeBean leaveListBean) {
+                        if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) {
+                            ++mCurPage;
+                            if (page == 1) {
+                                mDatas.clear();
+                                mDatas.addAll(leaveListBean.getRows());
+                            } else {
+                                mDatas.addAll(leaveListBean.getRows());
+                            }
+                            refreshView(STATE_LOAD_SUCCESS);
+                            mAdapter.notifyDataSetChanged();
+                            mXlvItems.refreshComplete();
+                            if (mDatas.size() >= leaveListBean.getTotal()) {
+                                mXlvItems.loadMoreComplete();
+                                mXlvItems.setNoMore(true);
+                            } else {
+                                mXlvItems.loadMoreComplete();
+                                mXlvItems.setNoMore(false);
+                            }
+                        } else {
+                            if (page > 1) {
+                                mXlvItems.loadMoreComplete();
+                                mXlvItems.setNoMore(true);
+                                refreshView(STATE_LOAD_SUCCESS);
+                            } else {
+                                if (TextUtils.isEmpty(mKeywords)) {
+                                    //无数据
+                                    refreshView(STATE_LOAD_EMPTY);
+                                } else {
+                                    ToastUtils.showShort("未查询到相关内容");
+                                }
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        ToastUtils.showShort("数据加载失,请稍后重试");
+                        refreshView(STATE_LOAD_ERROR);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mDisposable != null && !mDisposable.isDisposed()) {
+            mDisposable.dispose();
+        }
+        mXlvItems.destroy();
+        mXlvItems = null;
+        if (mBind != null) {
+            mBind.unbind();
+        }
+        super.onDestroy();
+    }
+}

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

@@ -120,7 +120,7 @@ public class CensusPetitionListActivity extends BaseActivity {
                     dialog1.show();
                     RetrofitManager.getInstance()
                             .create(LocationApiService.class)
-                            .doDelSecurity(bean.getPetitionId(), UserLgUtils.getToken())
+                            .doDelPetition(bean.getPetitionId(), UserLgUtils.getToken())
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(new Observer<SuccessBean>() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java

@@ -35,6 +35,7 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
 import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.ConvertUtils;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.TimeUtils;
 import com.sucstepsoft.cm_utils.utils.ToastUtils;
 import com.sucstepsoft.cm_utils.utils.UIUtil;
@@ -52,6 +53,7 @@ import com.sucstepsoft.realtimelocation.beans.SuccessBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.services.GlobalProvider;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
+import com.sucstepsoft.realtimelocation.utils.PointUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -93,8 +95,7 @@ public class WorkSignActivity extends BaseActivity {
     TextView mTvCurTime;
     @BindView(R.id.tv_out_time)
     TextView mTvOutTime;
-    @BindView(R.id.iv_state)
+
-    ImageView mIvState;
     @BindView(R.id.iv_sign_in_state)
     ImageView mIvSignInState;
     @BindView(R.id.iv_sign_out_state)
@@ -143,7 +144,7 @@ public class WorkSignActivity extends BaseActivity {
 
         mBtnResetLoc.setOnClickListener(v -> {
             if (mCurrent != null && mCurrent.getLatitude() != 0 && mCurrent.getLongitude() != 0) {
-                MapStatus cur = new MapStatus.Builder().zoom(16).target(new LatLng(mCurrent.getLatitude(), mCurrent.getLongitude())).build();
+                MapStatus cur = new MapStatus.Builder().zoom(20).target(new LatLng(mCurrent.getLatitude(), mCurrent.getLongitude())).build();
                 MapStatusUpdate curUpdate = MapStatusUpdateFactory.newMapStatus(cur);
                 mBaiduMap.animateMapStatus(curUpdate);
             }
@@ -175,7 +176,7 @@ public class WorkSignActivity extends BaseActivity {
                         if (checkCurrentPointIsBeyond(mCurrent)) {
                             showSignOffDialog();
                         } else {
-                            ToastUtils.showShort("当前位置不在所管辖片区内,请前往片区内进行签到或签退操作.");
+                            ToastUtils.showShort("当前位置不在打卡范围内.");
                         }
                     } else {
                         getUserGrid();
@@ -187,7 +188,7 @@ public class WorkSignActivity extends BaseActivity {
                     if (checkCurrentPointIsBeyond(mCurrent)) {
                         showSDialog();
                     } else {
-                        ToastUtils.showShort("当前位置不在所管辖片区内,请前往片区内进行签到或签退操作.");
+                        ToastUtils.showShort("当前位置不在打卡范围内");
                     }
                 } else {
                     getUserGrid();
@@ -238,7 +239,7 @@ public class WorkSignActivity extends BaseActivity {
                 }
             }
 
-            if (legal) {
+            if (!legal) {
                 hintMsg = "确定要签退吗?";
             } else {
                 hintMsg = "未到签退时间,提前签退属早退,您确定要早退吗?";
@@ -285,9 +286,6 @@ public class WorkSignActivity extends BaseActivity {
                             mIvSignInState.setBackground(getResources().getDrawable(R.drawable.ic_sign_late));
                         } else {
                             mIvSignInState.setBackground(getResources().getDrawable(R.drawable.ic_sign_normal));
-                            Glide.with(mActivity)
-                                    .load(R.drawable.ic_nomal)
-                                    .into(mIvState);
                             mTvState.setText("正常");
                             mTvState.setTextColor(Color.WHITE);
                         }
@@ -368,6 +366,7 @@ public class WorkSignActivity extends BaseActivity {
      * @param bdLocation
      */
     private boolean checkCurrentPointIsBeyond(BDLocation bdLocation) {
+        return true;
 //        if (mPenLineList != null && mPenLineList.size() > 0) {
 //            for (int i = 0; i < mPenLineList.size(); i++) {
 //                LatLng latLng = new LatLng(bdLocation.getLatitude(), bdLocation.getLongitude());
@@ -380,7 +379,6 @@ public class WorkSignActivity extends BaseActivity {
 //        } else {
 //            return false;
 //        }
-        return true;
     }
 
     private void checkSign() {
@@ -534,7 +532,7 @@ public class WorkSignActivity extends BaseActivity {
 
                     @Override
                     public void onNext(Long aLong) {
-                        String curTime = TimeUtils.getCurDate() + "\n" + TimeUtils.getCurTime();
+                        String curTime = TimeUtils.getCurDate() + " " + TimeUtils.getCurTime();
                         mTvCurTime.setText(curTime);
                     }
 
@@ -617,6 +615,7 @@ public class WorkSignActivity extends BaseActivity {
                             intent.putExtra("timeBean", mSignTimeBean);
                             sendBroadcast(intent);
                             setSignRuleTimeText();
+                            LogUtils.e(userType + "==");
                         }
 
                     }
@@ -750,7 +749,7 @@ public class WorkSignActivity extends BaseActivity {
      * @param latLng
      */
     private void moveMapToCenter(LatLng latLng) {
-        MapStatus cur = new MapStatus.Builder().zoom(16).target(latLng).build();
+        MapStatus cur = new MapStatus.Builder().zoom(18).target(latLng).build();
         MapStatusUpdate curUpdate = MapStatusUpdateFactory.newMapStatus(cur);
         mBaiduMap.animateMapStatus(curUpdate);
     }
@@ -793,9 +792,9 @@ public class WorkSignActivity extends BaseActivity {
             if (bdLocation != null && bdLocation.getLatitude() != Double.MIN_VALUE && bdLocation.getLongitude() != Double.MIN_VALUE) {
                 mCurrent = bdLocation;
                 if (TextUtils.isEmpty(mCurrent.getAddrStr())) {
-                    mTvCurLocation.setText("当前地址:未知");
+                    mTvCurLocation.setText("当前位置:未知");
                 } else {
-                    mTvCurLocation.setText("当前地址:" + mCurrent.getAddrStr());
+                    mTvCurLocation.setText("当前位置:" + mCurrent.getAddrStr());
                 }
                 mBaiduMap.setMyLocationEnabled(true);
                 MyLocationData locData = new MyLocationData.Builder()

app/src/main/java/com/sucstepsoft/realtimelocation/adapters/CorrectDisputeAdapter.java

@@ -0,0 +1,56 @@
+package com.sucstepsoft.realtimelocation.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.adapters.holders.CensusPersonHolder;
+import com.sucstepsoft.realtimelocation.beans.person.DisputeBean;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2020/11/17 - 1:22 PM
+ * 邮箱: itgaojian@163.com
+ * 描述: 人口adapter
+ */
+public class CorrectDisputeAdapter extends BaseRecyclerAdapter<DisputeBean.RowsBean, CensusPersonHolder> {
+    public CorrectDisputeAdapter(Context ctx, List<DisputeBean.RowsBean> list) {
+        super(ctx, list);
+    }
+
+    @Override
+    public CensusPersonHolder createHolder(ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person, parent, false);
+        return new CensusPersonHolder(itemView);
+    }
+
+    @Override
+    public void bindHolder(CensusPersonHolder censusPersonHolder, int i) {
+        DisputeBean.RowsBean bean = mData.get(i);
+        censusPersonHolder.mTvName.setText(bean.getCaseTitle());
+        censusPersonHolder.mTvNative.setText("发生日期:" + bean.getCaseTime());
+        censusPersonHolder.mTvPhone.setText("事件规模:" + bean.getCaseScaleName());
+        censusPersonHolder.mTvLocation.setVisibility(View.VISIBLE);
+        censusPersonHolder.mTvLocation.setText(bean.getCaseAddress());
+        censusPersonHolder.mLine.setVisibility(View.VISIBLE);
+        censusPersonHolder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i));
+        censusPersonHolder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i));
+    }
+
+    private OnEditListener mEditListener;
+
+    public void addOnEditListener(OnEditListener mListener) {
+        this.mEditListener = mListener;
+    }
+
+    public interface OnEditListener {
+        void onDel(DisputeBean.RowsBean bean, int pos);
+
+        void onEdit(DisputeBean.RowsBean bean, int pos);
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/adapters/NewNoticeAdapter.java

@@ -0,0 +1,38 @@
+package com.sucstepsoft.realtimelocation.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.adapters.holders.NoticeHolder;
+import com.sucstepsoft.realtimelocation.beans.NewsListBean;
+
+import java.util.List;
+
+/**
+ * 作者: Adam
+ * 日期: 2019/8/13 - 10:29
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class NewNoticeAdapter extends BaseRecyclerAdapter<NewsListBean.RowsBean, NoticeHolder> {
+    public NewNoticeAdapter(Context ctx, List<NewsListBean.RowsBean> list) {
+        super(ctx, list);
+    }
+
+    @Override
+    public NoticeHolder createHolder(ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_notice_new, parent, false);
+        return new NoticeHolder(itemView);
+    }
+
+    @Override
+    public void bindHolder(NoticeHolder noticeHolder, int i) {
+        noticeHolder.mTvTitle.setText(mData.get(i).getNewsTitle());
+        noticeHolder.mTvTime.setText(mData.get(i).getNewsTime());
+        noticeHolder.mTvPub.setText(mData.get(i).getNewsAuthor());
+    }
+}

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

@@ -0,0 +1,595 @@
+package com.sucstepsoft.realtimelocation.beans.person;
+
+import java.util.List;
+
+public class DisputeBean {
+
+    private int page;
+    private List<RowsBean> rows;
+    private int total;
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public List<RowsBean> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<RowsBean> rows) {
+        this.rows = rows;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public static class RowsBean {
+        private String caseAddress;
+        private String caseAreaCode;
+        private String caseAreaName;
+        private String caseDegree;
+        private String caseDescription;
+        private String caseEstimate;
+        private String caseEstimateName;
+        private String caseImages;
+        private String caseLat;
+        private String caseLevel;
+        private String caseLng;
+        private String caseMapAddress;
+        private String caseName;
+        private String caseScale;
+        private String caseScaleName;
+        private String caseTime;
+        private String caseTitle;
+        private String caseType;
+        private String caseTypeName;
+        private String creator;
+        private String defuseDescription;
+        private String defuseOrganization;
+        private String defuseResponsibleIdcard;
+        private String defuseResponsibleName;
+        private String defuseResponsiblePhone;
+        private String defuseResponsiblePopulationInfoId;
+        private String defuseStatus;
+        private String defuseTime;
+        private String defuseWay;
+        private String disputeId;
+        private String disputeLevel;
+        private String disputeMoney;
+        private String disputeNumber;
+        private String disputeOrganization;
+        private String disputeType;
+        private String evaluationOpinion;
+        private String evaluationTime;
+        private String gmtCreate;
+        private String gmtModified;
+        private String isDelete;
+        private String measureDescription;
+        private String mediateLastTime;
+        private String modifier;
+        private String partyAddress;
+        private String partyAreaCode;
+        private String partyAreaName;
+        private String partyEducation;
+        private String partyIdcard;
+        private String partyIdcardType;
+        private String partyName;
+        private String partyNation;
+        private String partyPhone;
+        private String partyPopulationInfoId;
+        private String partySex;
+        private String partyType;
+        private String partybIdcard;
+        private String partybName;
+        private String partybPhone;
+        private String partybPopulationInfoId;
+        private String recordDescription;
+        private String riskLevel;
+        private String riskType;
+
+        public String getCaseAddress() {
+            return caseAddress;
+        }
+
+        public void setCaseAddress(String caseAddress) {
+            this.caseAddress = caseAddress;
+        }
+
+        public String getCaseAreaCode() {
+            return caseAreaCode;
+        }
+
+        public void setCaseAreaCode(String caseAreaCode) {
+            this.caseAreaCode = caseAreaCode;
+        }
+
+        public String getCaseAreaName() {
+            return caseAreaName;
+        }
+
+        public void setCaseAreaName(String caseAreaName) {
+            this.caseAreaName = caseAreaName;
+        }
+
+        public String getCaseDegree() {
+            return caseDegree;
+        }
+
+        public void setCaseDegree(String caseDegree) {
+            this.caseDegree = caseDegree;
+        }
+
+        public String getCaseDescription() {
+            return caseDescription;
+        }
+
+        public void setCaseDescription(String caseDescription) {
+            this.caseDescription = caseDescription;
+        }
+
+        public String getCaseEstimate() {
+            return caseEstimate;
+        }
+
+        public void setCaseEstimate(String caseEstimate) {
+            this.caseEstimate = caseEstimate;
+        }
+
+        public String getCaseEstimateName() {
+            return caseEstimateName;
+        }
+
+        public void setCaseEstimateName(String caseEstimateName) {
+            this.caseEstimateName = caseEstimateName;
+        }
+
+        public String getCaseImages() {
+            return caseImages;
+        }
+
+        public void setCaseImages(String caseImages) {
+            this.caseImages = caseImages;
+        }
+
+        public String getCaseLat() {
+            return caseLat;
+        }
+
+        public void setCaseLat(String caseLat) {
+            this.caseLat = caseLat;
+        }
+
+        public String getCaseLevel() {
+            return caseLevel;
+        }
+
+        public void setCaseLevel(String caseLevel) {
+            this.caseLevel = caseLevel;
+        }
+
+        public String getCaseLng() {
+            return caseLng;
+        }
+
+        public void setCaseLng(String caseLng) {
+            this.caseLng = caseLng;
+        }
+
+        public String getCaseMapAddress() {
+            return caseMapAddress;
+        }
+
+        public void setCaseMapAddress(String caseMapAddress) {
+            this.caseMapAddress = caseMapAddress;
+        }
+
+        public String getCaseName() {
+            return caseName;
+        }
+
+        public void setCaseName(String caseName) {
+            this.caseName = caseName;
+        }
+
+        public String getCaseScale() {
+            return caseScale;
+        }
+
+        public void setCaseScale(String caseScale) {
+            this.caseScale = caseScale;
+        }
+
+        public String getCaseScaleName() {
+            return caseScaleName;
+        }
+
+        public void setCaseScaleName(String caseScaleName) {
+            this.caseScaleName = caseScaleName;
+        }
+
+        public String getCaseTime() {
+            return caseTime;
+        }
+
+        public void setCaseTime(String caseTime) {
+            this.caseTime = caseTime;
+        }
+
+        public String getCaseTitle() {
+            return caseTitle;
+        }
+
+        public void setCaseTitle(String caseTitle) {
+            this.caseTitle = caseTitle;
+        }
+
+        public String getCaseType() {
+            return caseType;
+        }
+
+        public void setCaseType(String caseType) {
+            this.caseType = caseType;
+        }
+
+        public String getCaseTypeName() {
+            return caseTypeName;
+        }
+
+        public void setCaseTypeName(String caseTypeName) {
+            this.caseTypeName = caseTypeName;
+        }
+
+        public String getCreator() {
+            return creator;
+        }
+
+        public void setCreator(String creator) {
+            this.creator = creator;
+        }
+
+        public String getDefuseDescription() {
+            return defuseDescription;
+        }
+
+        public void setDefuseDescription(String defuseDescription) {
+            this.defuseDescription = defuseDescription;
+        }
+
+        public String getDefuseOrganization() {
+            return defuseOrganization;
+        }
+
+        public void setDefuseOrganization(String defuseOrganization) {
+            this.defuseOrganization = defuseOrganization;
+        }
+
+        public String getDefuseResponsibleIdcard() {
+            return defuseResponsibleIdcard;
+        }
+
+        public void setDefuseResponsibleIdcard(String defuseResponsibleIdcard) {
+            this.defuseResponsibleIdcard = defuseResponsibleIdcard;
+        }
+
+        public String getDefuseResponsibleName() {
+            return defuseResponsibleName;
+        }
+
+        public void setDefuseResponsibleName(String defuseResponsibleName) {
+            this.defuseResponsibleName = defuseResponsibleName;
+        }
+
+        public String getDefuseResponsiblePhone() {
+            return defuseResponsiblePhone;
+        }
+
+        public void setDefuseResponsiblePhone(String defuseResponsiblePhone) {
+            this.defuseResponsiblePhone = defuseResponsiblePhone;
+        }
+
+        public String getDefuseResponsiblePopulationInfoId() {
+            return defuseResponsiblePopulationInfoId;
+        }
+
+        public void setDefuseResponsiblePopulationInfoId(String defuseResponsiblePopulationInfoId) {
+            this.defuseResponsiblePopulationInfoId = defuseResponsiblePopulationInfoId;
+        }
+
+        public String getDefuseStatus() {
+            return defuseStatus;
+        }
+
+        public void setDefuseStatus(String defuseStatus) {
+            this.defuseStatus = defuseStatus;
+        }
+
+        public String getDefuseTime() {
+            return defuseTime;
+        }
+
+        public void setDefuseTime(String defuseTime) {
+            this.defuseTime = defuseTime;
+        }
+
+        public String getDefuseWay() {
+            return defuseWay;
+        }
+
+        public void setDefuseWay(String defuseWay) {
+            this.defuseWay = defuseWay;
+        }
+
+        public String getDisputeId() {
+            return disputeId;
+        }
+
+        public void setDisputeId(String disputeId) {
+            this.disputeId = disputeId;
+        }
+
+        public String getDisputeLevel() {
+            return disputeLevel;
+        }
+
+        public void setDisputeLevel(String disputeLevel) {
+            this.disputeLevel = disputeLevel;
+        }
+
+        public String getDisputeMoney() {
+            return disputeMoney;
+        }
+
+        public void setDisputeMoney(String disputeMoney) {
+            this.disputeMoney = disputeMoney;
+        }
+
+        public String getDisputeNumber() {
+            return disputeNumber;
+        }
+
+        public void setDisputeNumber(String disputeNumber) {
+            this.disputeNumber = disputeNumber;
+        }
+
+        public String getDisputeOrganization() {
+            return disputeOrganization;
+        }
+
+        public void setDisputeOrganization(String disputeOrganization) {
+            this.disputeOrganization = disputeOrganization;
+        }
+
+        public String getDisputeType() {
+            return disputeType;
+        }
+
+        public void setDisputeType(String disputeType) {
+            this.disputeType = disputeType;
+        }
+
+        public String getEvaluationOpinion() {
+            return evaluationOpinion;
+        }
+
+        public void setEvaluationOpinion(String evaluationOpinion) {
+            this.evaluationOpinion = evaluationOpinion;
+        }
+
+        public String getEvaluationTime() {
+            return evaluationTime;
+        }
+
+        public void setEvaluationTime(String evaluationTime) {
+            this.evaluationTime = evaluationTime;
+        }
+
+        public String getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(String gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+        public String getGmtModified() {
+            return gmtModified;
+        }
+
+        public void setGmtModified(String gmtModified) {
+            this.gmtModified = gmtModified;
+        }
+
+        public String getIsDelete() {
+            return isDelete;
+        }
+
+        public void setIsDelete(String isDelete) {
+            this.isDelete = isDelete;
+        }
+
+        public String getMeasureDescription() {
+            return measureDescription;
+        }
+
+        public void setMeasureDescription(String measureDescription) {
+            this.measureDescription = measureDescription;
+        }
+
+        public String getMediateLastTime() {
+            return mediateLastTime;
+        }
+
+        public void setMediateLastTime(String mediateLastTime) {
+            this.mediateLastTime = mediateLastTime;
+        }
+
+        public String getModifier() {
+            return modifier;
+        }
+
+        public void setModifier(String modifier) {
+            this.modifier = modifier;
+        }
+
+        public String getPartyAddress() {
+            return partyAddress;
+        }
+
+        public void setPartyAddress(String partyAddress) {
+            this.partyAddress = partyAddress;
+        }
+
+        public String getPartyAreaCode() {
+            return partyAreaCode;
+        }
+
+        public void setPartyAreaCode(String partyAreaCode) {
+            this.partyAreaCode = partyAreaCode;
+        }
+
+        public String getPartyAreaName() {
+            return partyAreaName;
+        }
+
+        public void setPartyAreaName(String partyAreaName) {
+            this.partyAreaName = partyAreaName;
+        }
+
+        public String getPartyEducation() {
+            return partyEducation;
+        }
+
+        public void setPartyEducation(String partyEducation) {
+            this.partyEducation = partyEducation;
+        }
+
+        public String getPartyIdcard() {
+            return partyIdcard;
+        }
+
+        public void setPartyIdcard(String partyIdcard) {
+            this.partyIdcard = partyIdcard;
+        }
+
+        public String getPartyIdcardType() {
+            return partyIdcardType;
+        }
+
+        public void setPartyIdcardType(String partyIdcardType) {
+            this.partyIdcardType = partyIdcardType;
+        }
+
+        public String getPartyName() {
+            return partyName;
+        }
+
+        public void setPartyName(String partyName) {
+            this.partyName = partyName;
+        }
+
+        public String getPartyNation() {
+            return partyNation;
+        }
+
+        public void setPartyNation(String partyNation) {
+            this.partyNation = partyNation;
+        }
+
+        public String getPartyPhone() {
+            return partyPhone;
+        }
+
+        public void setPartyPhone(String partyPhone) {
+            this.partyPhone = partyPhone;
+        }
+
+        public String getPartyPopulationInfoId() {
+            return partyPopulationInfoId;
+        }
+
+        public void setPartyPopulationInfoId(String partyPopulationInfoId) {
+            this.partyPopulationInfoId = partyPopulationInfoId;
+        }
+
+        public String getPartySex() {
+            return partySex;
+        }
+
+        public void setPartySex(String partySex) {
+            this.partySex = partySex;
+        }
+
+        public String getPartyType() {
+            return partyType;
+        }
+
+        public void setPartyType(String partyType) {
+            this.partyType = partyType;
+        }
+
+        public String getPartybIdcard() {
+            return partybIdcard;
+        }
+
+        public void setPartybIdcard(String partybIdcard) {
+            this.partybIdcard = partybIdcard;
+        }
+
+        public String getPartybName() {
+            return partybName;
+        }
+
+        public void setPartybName(String partybName) {
+            this.partybName = partybName;
+        }
+
+        public String getPartybPhone() {
+            return partybPhone;
+        }
+
+        public void setPartybPhone(String partybPhone) {
+            this.partybPhone = partybPhone;
+        }
+
+        public String getPartybPopulationInfoId() {
+            return partybPopulationInfoId;
+        }
+
+        public void setPartybPopulationInfoId(String partybPopulationInfoId) {
+            this.partybPopulationInfoId = partybPopulationInfoId;
+        }
+
+        public String getRecordDescription() {
+            return recordDescription;
+        }
+
+        public void setRecordDescription(String recordDescription) {
+            this.recordDescription = recordDescription;
+        }
+
+        public String getRiskLevel() {
+            return riskLevel;
+        }
+
+        public void setRiskLevel(String riskLevel) {
+            this.riskLevel = riskLevel;
+        }
+
+        public String getRiskType() {
+            return riskType;
+        }
+
+        public void setRiskType(String riskType) {
+            this.riskType = riskType;
+        }
+    }
+}

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

@@ -0,0 +1,626 @@
+package com.sucstepsoft.realtimelocation.beans.person;
+
+public class DisputeDetailBean {
+
+    private String caseAddress;
+    private String caseAreaCode;
+    private String caseAreaName;
+    private String caseDegree;
+    private String caseDegreeName;
+    private String caseDescription;
+    private String caseEstimate;
+    private String caseEstimateName;
+    private String caseImages;
+    private String caseLat;
+    private String caseLevel;
+    private String caseLevelName;
+    private String caseLng;
+    private String caseMapAddress;
+    private String caseName;
+    private String caseScale;
+    private String caseScaleName;
+    private String caseTime;
+    private String caseTitle;
+    private String caseType;
+    private String caseTypeName;
+    private String creator;
+    private String defuseDescription;
+    private String defuseOrganization;
+    private String defuseResponsibleIdcard;
+    private String defuseResponsibleName;
+    private String defuseResponsiblePhone;
+    private String defuseResponsiblePopulationInfoId;
+    private String defuseStatus;
+    private String defuseTime;
+    private String defuseWay;
+    private String defuseWayName;
+    private String disputeId;
+    private String disputeLevel;
+    private String disputeLevelName;
+    private String disputeMoney;
+    private String disputeNumber;
+    private String disputeOrganization;
+    private String disputeType;
+    private String disputeTypeName;
+    private String evaluationOpinion;
+    private String evaluationTime;
+    private String gmtCreate;
+    private String gmtModified;
+    private String isDelete;
+    private String measureDescription;
+    private String mediateLastTime;
+    private String modifier;
+    private String partyAddress;
+    private String partyAreaCode;
+    private String partyAreaName;
+    private String partyEducation;
+    private String partyIdcard;
+    private String partyIdcardType;
+    private String partyName;
+    private String partyNation;
+    private String partyPhone;
+    private String partyPopulationInfoId;
+    private String partySex;
+    private String partyType;
+    private String partybIdcard;
+    private String partybName;
+    private String partybPhone;
+    private String partybPopulationInfoId;
+    private String recordDescription;
+    private String riskLevel;
+    private String riskLevelName;
+    private String riskType;
+    private String riskTypeName;
+
+    public String getCaseAddress() {
+        return caseAddress;
+    }
+
+    public void setCaseAddress(String caseAddress) {
+        this.caseAddress = caseAddress;
+    }
+
+    public String getCaseAreaCode() {
+        return caseAreaCode;
+    }
+
+    public void setCaseAreaCode(String caseAreaCode) {
+        this.caseAreaCode = caseAreaCode;
+    }
+
+    public String getCaseAreaName() {
+        return caseAreaName;
+    }
+
+    public void setCaseAreaName(String caseAreaName) {
+        this.caseAreaName = caseAreaName;
+    }
+
+    public String getCaseDegree() {
+        return caseDegree;
+    }
+
+    public void setCaseDegree(String caseDegree) {
+        this.caseDegree = caseDegree;
+    }
+
+    public String getCaseDegreeName() {
+        return caseDegreeName;
+    }
+
+    public void setCaseDegreeName(String caseDegreeName) {
+        this.caseDegreeName = caseDegreeName;
+    }
+
+    public String getCaseDescription() {
+        return caseDescription;
+    }
+
+    public void setCaseDescription(String caseDescription) {
+        this.caseDescription = caseDescription;
+    }
+
+    public String getCaseEstimate() {
+        return caseEstimate;
+    }
+
+    public void setCaseEstimate(String caseEstimate) {
+        this.caseEstimate = caseEstimate;
+    }
+
+    public String getCaseEstimateName() {
+        return caseEstimateName;
+    }
+
+    public void setCaseEstimateName(String caseEstimateName) {
+        this.caseEstimateName = caseEstimateName;
+    }
+
+    public String getCaseImages() {
+        return caseImages;
+    }
+
+    public void setCaseImages(String caseImages) {
+        this.caseImages = caseImages;
+    }
+
+    public String getCaseLat() {
+        return caseLat;
+    }
+
+    public void setCaseLat(String caseLat) {
+        this.caseLat = caseLat;
+    }
+
+    public String getCaseLevel() {
+        return caseLevel;
+    }
+
+    public void setCaseLevel(String caseLevel) {
+        this.caseLevel = caseLevel;
+    }
+
+    public String getCaseLevelName() {
+        return caseLevelName;
+    }
+
+    public void setCaseLevelName(String caseLevelName) {
+        this.caseLevelName = caseLevelName;
+    }
+
+    public String getCaseLng() {
+        return caseLng;
+    }
+
+    public void setCaseLng(String caseLng) {
+        this.caseLng = caseLng;
+    }
+
+    public String getCaseMapAddress() {
+        return caseMapAddress;
+    }
+
+    public void setCaseMapAddress(String caseMapAddress) {
+        this.caseMapAddress = caseMapAddress;
+    }
+
+    public String getCaseName() {
+        return caseName;
+    }
+
+    public void setCaseName(String caseName) {
+        this.caseName = caseName;
+    }
+
+    public String getCaseScale() {
+        return caseScale;
+    }
+
+    public void setCaseScale(String caseScale) {
+        this.caseScale = caseScale;
+    }
+
+    public String getCaseScaleName() {
+        return caseScaleName;
+    }
+
+    public void setCaseScaleName(String caseScaleName) {
+        this.caseScaleName = caseScaleName;
+    }
+
+    public String getCaseTime() {
+        return caseTime;
+    }
+
+    public void setCaseTime(String caseTime) {
+        this.caseTime = caseTime;
+    }
+
+    public String getCaseTitle() {
+        return caseTitle;
+    }
+
+    public void setCaseTitle(String caseTitle) {
+        this.caseTitle = caseTitle;
+    }
+
+    public String getCaseType() {
+        return caseType;
+    }
+
+    public void setCaseType(String caseType) {
+        this.caseType = caseType;
+    }
+
+    public String getCaseTypeName() {
+        return caseTypeName;
+    }
+
+    public void setCaseTypeName(String caseTypeName) {
+        this.caseTypeName = caseTypeName;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getDefuseDescription() {
+        return defuseDescription;
+    }
+
+    public void setDefuseDescription(String defuseDescription) {
+        this.defuseDescription = defuseDescription;
+    }
+
+    public String getDefuseOrganization() {
+        return defuseOrganization;
+    }
+
+    public void setDefuseOrganization(String defuseOrganization) {
+        this.defuseOrganization = defuseOrganization;
+    }
+
+    public String getDefuseResponsibleIdcard() {
+        return defuseResponsibleIdcard;
+    }
+
+    public void setDefuseResponsibleIdcard(String defuseResponsibleIdcard) {
+        this.defuseResponsibleIdcard = defuseResponsibleIdcard;
+    }
+
+    public String getDefuseResponsibleName() {
+        return defuseResponsibleName;
+    }
+
+    public void setDefuseResponsibleName(String defuseResponsibleName) {
+        this.defuseResponsibleName = defuseResponsibleName;
+    }
+
+    public String getDefuseResponsiblePhone() {
+        return defuseResponsiblePhone;
+    }
+
+    public void setDefuseResponsiblePhone(String defuseResponsiblePhone) {
+        this.defuseResponsiblePhone = defuseResponsiblePhone;
+    }
+
+    public String getDefuseResponsiblePopulationInfoId() {
+        return defuseResponsiblePopulationInfoId;
+    }
+
+    public void setDefuseResponsiblePopulationInfoId(String defuseResponsiblePopulationInfoId) {
+        this.defuseResponsiblePopulationInfoId = defuseResponsiblePopulationInfoId;
+    }
+
+    public String getDefuseStatus() {
+        return defuseStatus;
+    }
+
+    public void setDefuseStatus(String defuseStatus) {
+        this.defuseStatus = defuseStatus;
+    }
+
+    public String getDefuseTime() {
+        return defuseTime;
+    }
+
+    public void setDefuseTime(String defuseTime) {
+        this.defuseTime = defuseTime;
+    }
+
+    public String getDefuseWay() {
+        return defuseWay;
+    }
+
+    public void setDefuseWay(String defuseWay) {
+        this.defuseWay = defuseWay;
+    }
+
+    public String getDefuseWayName() {
+        return defuseWayName;
+    }
+
+    public void setDefuseWayName(String defuseWayName) {
+        this.defuseWayName = defuseWayName;
+    }
+
+    public String getDisputeId() {
+        return disputeId;
+    }
+
+    public void setDisputeId(String disputeId) {
+        this.disputeId = disputeId;
+    }
+
+    public String getDisputeLevel() {
+        return disputeLevel;
+    }
+
+    public void setDisputeLevel(String disputeLevel) {
+        this.disputeLevel = disputeLevel;
+    }
+
+    public String getDisputeLevelName() {
+        return disputeLevelName;
+    }
+
+    public void setDisputeLevelName(String disputeLevelName) {
+        this.disputeLevelName = disputeLevelName;
+    }
+
+    public String getDisputeMoney() {
+        return disputeMoney;
+    }
+
+    public void setDisputeMoney(String disputeMoney) {
+        this.disputeMoney = disputeMoney;
+    }
+
+    public String getDisputeNumber() {
+        return disputeNumber;
+    }
+
+    public void setDisputeNumber(String disputeNumber) {
+        this.disputeNumber = disputeNumber;
+    }
+
+    public String getDisputeOrganization() {
+        return disputeOrganization;
+    }
+
+    public void setDisputeOrganization(String disputeOrganization) {
+        this.disputeOrganization = disputeOrganization;
+    }
+
+    public String getDisputeType() {
+        return disputeType;
+    }
+
+    public void setDisputeType(String disputeType) {
+        this.disputeType = disputeType;
+    }
+
+    public String getDisputeTypeName() {
+        return disputeTypeName;
+    }
+
+    public void setDisputeTypeName(String disputeTypeName) {
+        this.disputeTypeName = disputeTypeName;
+    }
+
+    public String getEvaluationOpinion() {
+        return evaluationOpinion;
+    }
+
+    public void setEvaluationOpinion(String evaluationOpinion) {
+        this.evaluationOpinion = evaluationOpinion;
+    }
+
+    public String getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    public void setEvaluationTime(String evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    public String getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public String getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(String isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getMeasureDescription() {
+        return measureDescription;
+    }
+
+    public void setMeasureDescription(String measureDescription) {
+        this.measureDescription = measureDescription;
+    }
+
+    public String getMediateLastTime() {
+        return mediateLastTime;
+    }
+
+    public void setMediateLastTime(String mediateLastTime) {
+        this.mediateLastTime = mediateLastTime;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getPartyAddress() {
+        return partyAddress;
+    }
+
+    public void setPartyAddress(String partyAddress) {
+        this.partyAddress = partyAddress;
+    }
+
+    public String getPartyAreaCode() {
+        return partyAreaCode;
+    }
+
+    public void setPartyAreaCode(String partyAreaCode) {
+        this.partyAreaCode = partyAreaCode;
+    }
+
+    public String getPartyAreaName() {
+        return partyAreaName;
+    }
+
+    public void setPartyAreaName(String partyAreaName) {
+        this.partyAreaName = partyAreaName;
+    }
+
+    public String getPartyEducation() {
+        return partyEducation;
+    }
+
+    public void setPartyEducation(String partyEducation) {
+        this.partyEducation = partyEducation;
+    }
+
+    public String getPartyIdcard() {
+        return partyIdcard;
+    }
+
+    public void setPartyIdcard(String partyIdcard) {
+        this.partyIdcard = partyIdcard;
+    }
+
+    public String getPartyIdcardType() {
+        return partyIdcardType;
+    }
+
+    public void setPartyIdcardType(String partyIdcardType) {
+        this.partyIdcardType = partyIdcardType;
+    }
+
+    public String getPartyName() {
+        return partyName;
+    }
+
+    public void setPartyName(String partyName) {
+        this.partyName = partyName;
+    }
+
+    public String getPartyNation() {
+        return partyNation;
+    }
+
+    public void setPartyNation(String partyNation) {
+        this.partyNation = partyNation;
+    }
+
+    public String getPartyPhone() {
+        return partyPhone;
+    }
+
+    public void setPartyPhone(String partyPhone) {
+        this.partyPhone = partyPhone;
+    }
+
+    public String getPartyPopulationInfoId() {
+        return partyPopulationInfoId;
+    }
+
+    public void setPartyPopulationInfoId(String partyPopulationInfoId) {
+        this.partyPopulationInfoId = partyPopulationInfoId;
+    }
+
+    public String getPartySex() {
+        return partySex;
+    }
+
+    public void setPartySex(String partySex) {
+        this.partySex = partySex;
+    }
+
+    public String getPartyType() {
+        return partyType;
+    }
+
+    public void setPartyType(String partyType) {
+        this.partyType = partyType;
+    }
+
+    public String getPartybIdcard() {
+        return partybIdcard;
+    }
+
+    public void setPartybIdcard(String partybIdcard) {
+        this.partybIdcard = partybIdcard;
+    }
+
+    public String getPartybName() {
+        return partybName;
+    }
+
+    public void setPartybName(String partybName) {
+        this.partybName = partybName;
+    }
+
+    public String getPartybPhone() {
+        return partybPhone;
+    }
+
+    public void setPartybPhone(String partybPhone) {
+        this.partybPhone = partybPhone;
+    }
+
+    public String getPartybPopulationInfoId() {
+        return partybPopulationInfoId;
+    }
+
+    public void setPartybPopulationInfoId(String partybPopulationInfoId) {
+        this.partybPopulationInfoId = partybPopulationInfoId;
+    }
+
+    public String getRecordDescription() {
+        return recordDescription;
+    }
+
+    public void setRecordDescription(String recordDescription) {
+        this.recordDescription = recordDescription;
+    }
+
+    public String getRiskLevel() {
+        return riskLevel;
+    }
+
+    public void setRiskLevel(String riskLevel) {
+        this.riskLevel = riskLevel;
+    }
+
+    public String getRiskLevelName() {
+        return riskLevelName;
+    }
+
+    public void setRiskLevelName(String riskLevelName) {
+        this.riskLevelName = riskLevelName;
+    }
+
+    public String getRiskType() {
+        return riskType;
+    }
+
+    public void setRiskType(String riskType) {
+        this.riskType = riskType;
+    }
+
+    public String getRiskTypeName() {
+        return riskTypeName;
+    }
+
+    public void setRiskTypeName(String riskTypeName) {
+        this.riskTypeName = riskTypeName;
+    }
+}

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

@@ -0,0 +1,482 @@
+package com.sucstepsoft.realtimelocation.beans.person;
+
+public class SaveDisputeBean {
+
+    private String caseAddress;
+    private String caseAreaCode;
+    private String caseAreaName;
+    private String caseDegree;
+    private String caseDescription;
+    private String caseEstimate;
+    private String caseImages;
+    private String caseLat;
+    private String caseLevel;
+    private String caseLng;
+    private String caseMapAddress;
+    private String caseName;
+    private String caseScale;
+    private String caseTime;
+    private String caseTitle;
+    private String caseType;
+    private String defuseDescription;
+    private String defuseOrganization;
+    private String defuseResponsibleIdcard;
+    private String defuseResponsibleName;
+    private String defuseResponsiblePhone;
+    private String defuseResponsiblePopulationInfoId;
+    private String defuseStatus;
+    private String defuseTime;
+    private String defuseWay;
+    private String disputeLevel;
+    private String disputeMoney;
+    private String disputeNumber;
+    private String disputeOrganization;
+    private String disputeType;
+    private String evaluationOpinion;
+    private String evaluationTime;
+    private String measureDescription;
+    private String mediateLastTime;
+    private String partyAddress;
+    private String partyAreaCode;
+    private String partyAreaName;
+    private String partyEducation;
+    private String partyIdcard;
+    private String partyIdcardType;
+    private String partyName;
+    private String partyNation;
+    private String partyPhone;
+    private String partyPopulationInfoId;
+    private String partySex;
+    private String partyType;
+    private String partybIdcard;
+    private String partybName;
+    private String partybPhone;
+    private String partybPopulationInfoId;
+    private String recordDescription;
+    private String riskLevel;
+    private String riskType;
+
+    public String getCaseAddress() {
+        return caseAddress;
+    }
+
+    public void setCaseAddress(String caseAddress) {
+        this.caseAddress = caseAddress;
+    }
+
+    public String getCaseAreaCode() {
+        return caseAreaCode;
+    }
+
+    public void setCaseAreaCode(String caseAreaCode) {
+        this.caseAreaCode = caseAreaCode;
+    }
+
+    public String getCaseAreaName() {
+        return caseAreaName;
+    }
+
+    public void setCaseAreaName(String caseAreaName) {
+        this.caseAreaName = caseAreaName;
+    }
+
+    public String getCaseDegree() {
+        return caseDegree;
+    }
+
+    public void setCaseDegree(String caseDegree) {
+        this.caseDegree = caseDegree;
+    }
+
+    public String getCaseDescription() {
+        return caseDescription;
+    }
+
+    public void setCaseDescription(String caseDescription) {
+        this.caseDescription = caseDescription;
+    }
+
+    public String getCaseEstimate() {
+        return caseEstimate;
+    }
+
+    public void setCaseEstimate(String caseEstimate) {
+        this.caseEstimate = caseEstimate;
+    }
+
+    public String getCaseImages() {
+        return caseImages;
+    }
+
+    public void setCaseImages(String caseImages) {
+        this.caseImages = caseImages;
+    }
+
+    public String getCaseLat() {
+        return caseLat;
+    }
+
+    public void setCaseLat(String caseLat) {
+        this.caseLat = caseLat;
+    }
+
+    public String getCaseLevel() {
+        return caseLevel;
+    }
+
+    public void setCaseLevel(String caseLevel) {
+        this.caseLevel = caseLevel;
+    }
+
+    public String getCaseLng() {
+        return caseLng;
+    }
+
+    public void setCaseLng(String caseLng) {
+        this.caseLng = caseLng;
+    }
+
+    public String getCaseMapAddress() {
+        return caseMapAddress;
+    }
+
+    public void setCaseMapAddress(String caseMapAddress) {
+        this.caseMapAddress = caseMapAddress;
+    }
+
+    public String getCaseName() {
+        return caseName;
+    }
+
+    public void setCaseName(String caseName) {
+        this.caseName = caseName;
+    }
+
+    public String getCaseScale() {
+        return caseScale;
+    }
+
+    public void setCaseScale(String caseScale) {
+        this.caseScale = caseScale;
+    }
+
+    public String getCaseTime() {
+        return caseTime;
+    }
+
+    public void setCaseTime(String caseTime) {
+        this.caseTime = caseTime;
+    }
+
+    public String getCaseTitle() {
+        return caseTitle;
+    }
+
+    public void setCaseTitle(String caseTitle) {
+        this.caseTitle = caseTitle;
+    }
+
+    public String getCaseType() {
+        return caseType;
+    }
+
+    public void setCaseType(String caseType) {
+        this.caseType = caseType;
+    }
+
+    public String getDefuseDescription() {
+        return defuseDescription;
+    }
+
+    public void setDefuseDescription(String defuseDescription) {
+        this.defuseDescription = defuseDescription;
+    }
+
+    public String getDefuseOrganization() {
+        return defuseOrganization;
+    }
+
+    public void setDefuseOrganization(String defuseOrganization) {
+        this.defuseOrganization = defuseOrganization;
+    }
+
+    public String getDefuseResponsibleIdcard() {
+        return defuseResponsibleIdcard;
+    }
+
+    public void setDefuseResponsibleIdcard(String defuseResponsibleIdcard) {
+        this.defuseResponsibleIdcard = defuseResponsibleIdcard;
+    }
+
+    public String getDefuseResponsibleName() {
+        return defuseResponsibleName;
+    }
+
+    public void setDefuseResponsibleName(String defuseResponsibleName) {
+        this.defuseResponsibleName = defuseResponsibleName;
+    }
+
+    public String getDefuseResponsiblePhone() {
+        return defuseResponsiblePhone;
+    }
+
+    public void setDefuseResponsiblePhone(String defuseResponsiblePhone) {
+        this.defuseResponsiblePhone = defuseResponsiblePhone;
+    }
+
+    public String getDefuseResponsiblePopulationInfoId() {
+        return defuseResponsiblePopulationInfoId;
+    }
+
+    public void setDefuseResponsiblePopulationInfoId(String defuseResponsiblePopulationInfoId) {
+        this.defuseResponsiblePopulationInfoId = defuseResponsiblePopulationInfoId;
+    }
+
+    public String getDefuseStatus() {
+        return defuseStatus;
+    }
+
+    public void setDefuseStatus(String defuseStatus) {
+        this.defuseStatus = defuseStatus;
+    }
+
+    public String getDefuseTime() {
+        return defuseTime;
+    }
+
+    public void setDefuseTime(String defuseTime) {
+        this.defuseTime = defuseTime;
+    }
+
+    public String getDefuseWay() {
+        return defuseWay;
+    }
+
+    public void setDefuseWay(String defuseWay) {
+        this.defuseWay = defuseWay;
+    }
+
+    public String getDisputeLevel() {
+        return disputeLevel;
+    }
+
+    public void setDisputeLevel(String disputeLevel) {
+        this.disputeLevel = disputeLevel;
+    }
+
+    public String getDisputeMoney() {
+        return disputeMoney;
+    }
+
+    public void setDisputeMoney(String disputeMoney) {
+        this.disputeMoney = disputeMoney;
+    }
+
+    public String getDisputeNumber() {
+        return disputeNumber;
+    }
+
+    public void setDisputeNumber(String disputeNumber) {
+        this.disputeNumber = disputeNumber;
+    }
+
+    public String getDisputeOrganization() {
+        return disputeOrganization;
+    }
+
+    public void setDisputeOrganization(String disputeOrganization) {
+        this.disputeOrganization = disputeOrganization;
+    }
+
+    public String getDisputeType() {
+        return disputeType;
+    }
+
+    public void setDisputeType(String disputeType) {
+        this.disputeType = disputeType;
+    }
+
+    public String getEvaluationOpinion() {
+        return evaluationOpinion;
+    }
+
+    public void setEvaluationOpinion(String evaluationOpinion) {
+        this.evaluationOpinion = evaluationOpinion;
+    }
+
+    public String getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    public void setEvaluationTime(String evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    public String getMeasureDescription() {
+        return measureDescription;
+    }
+
+    public void setMeasureDescription(String measureDescription) {
+        this.measureDescription = measureDescription;
+    }
+
+    public String getMediateLastTime() {
+        return mediateLastTime;
+    }
+
+    public void setMediateLastTime(String mediateLastTime) {
+        this.mediateLastTime = mediateLastTime;
+    }
+
+    public String getPartyAddress() {
+        return partyAddress;
+    }
+
+    public void setPartyAddress(String partyAddress) {
+        this.partyAddress = partyAddress;
+    }
+
+    public String getPartyAreaCode() {
+        return partyAreaCode;
+    }
+
+    public void setPartyAreaCode(String partyAreaCode) {
+        this.partyAreaCode = partyAreaCode;
+    }
+
+    public String getPartyAreaName() {
+        return partyAreaName;
+    }
+
+    public void setPartyAreaName(String partyAreaName) {
+        this.partyAreaName = partyAreaName;
+    }
+
+    public String getPartyEducation() {
+        return partyEducation;
+    }
+
+    public void setPartyEducation(String partyEducation) {
+        this.partyEducation = partyEducation;
+    }
+
+    public String getPartyIdcard() {
+        return partyIdcard;
+    }
+
+    public void setPartyIdcard(String partyIdcard) {
+        this.partyIdcard = partyIdcard;
+    }
+
+    public String getPartyIdcardType() {
+        return partyIdcardType;
+    }
+
+    public void setPartyIdcardType(String partyIdcardType) {
+        this.partyIdcardType = partyIdcardType;
+    }
+
+    public String getPartyName() {
+        return partyName;
+    }
+
+    public void setPartyName(String partyName) {
+        this.partyName = partyName;
+    }
+
+    public String getPartyNation() {
+        return partyNation;
+    }
+
+    public void setPartyNation(String partyNation) {
+        this.partyNation = partyNation;
+    }
+
+    public String getPartyPhone() {
+        return partyPhone;
+    }
+
+    public void setPartyPhone(String partyPhone) {
+        this.partyPhone = partyPhone;
+    }
+
+    public String getPartyPopulationInfoId() {
+        return partyPopulationInfoId;
+    }
+
+    public void setPartyPopulationInfoId(String partyPopulationInfoId) {
+        this.partyPopulationInfoId = partyPopulationInfoId;
+    }
+
+    public String getPartySex() {
+        return partySex;
+    }
+
+    public void setPartySex(String partySex) {
+        this.partySex = partySex;
+    }
+
+    public String getPartyType() {
+        return partyType;
+    }
+
+    public void setPartyType(String partyType) {
+        this.partyType = partyType;
+    }
+
+    public String getPartybIdcard() {
+        return partybIdcard;
+    }
+
+    public void setPartybIdcard(String partybIdcard) {
+        this.partybIdcard = partybIdcard;
+    }
+
+    public String getPartybName() {
+        return partybName;
+    }
+
+    public void setPartybName(String partybName) {
+        this.partybName = partybName;
+    }
+
+    public String getPartybPhone() {
+        return partybPhone;
+    }
+
+    public void setPartybPhone(String partybPhone) {
+        this.partybPhone = partybPhone;
+    }
+
+    public String getPartybPopulationInfoId() {
+        return partybPopulationInfoId;
+    }
+
+    public void setPartybPopulationInfoId(String partybPopulationInfoId) {
+        this.partybPopulationInfoId = partybPopulationInfoId;
+    }
+
+    public String getRecordDescription() {
+        return recordDescription;
+    }
+
+    public void setRecordDescription(String recordDescription) {
+        this.recordDescription = recordDescription;
+    }
+
+    public String getRiskLevel() {
+        return riskLevel;
+    }
+
+    public void setRiskLevel(String riskLevel) {
+        this.riskLevel = riskLevel;
+    }
+
+    public String getRiskType() {
+        return riskType;
+    }
+
+    public void setRiskType(String riskType) {
+        this.riskType = riskType;
+    }
+}

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

@@ -52,6 +52,8 @@ import com.sucstepsoft.realtimelocation.beans.person.CensusRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CensusYoungDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CommunityListBean;
 import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.DisputeBean;
+import com.sucstepsoft.realtimelocation.beans.person.DisputeDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean;
 import com.sucstepsoft.realtimelocation.beans.person.HeresyBean;
@@ -1356,12 +1358,51 @@ public interface LocationApiService {
 
 
     /**
-     * 涉邪重点上访
+     * 重点上访
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
     @GET("app/petition/listpagepetition")
     Observable<PetitionBean> getPetitionList(@Query("populationInfoId") String id, @Query("page") String page, @Query("keywords") String key, @Header("token") String token);
 
+
+    /*===========================================矛盾纠纷===========================================*/
+
+    /**
+     * 保存矛盾纠纷
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @POST("app/dispute/save")
+    Observable<SuccessBean> doSaveDispute(@Body RequestBody body, @Header("token") String token);
+
+    /**
+     * 编辑矛盾纠纷
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @PUT("app/dispute/updatedispute/{disputeId}")
+    Observable<SuccessBean> doEditDispute(@Path("disputeId") String id, @Body RequestBody body, @Header("token") String token);
+
+    /**
+     * 删除矛盾纠纷
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @DELETE("app/dispute/remove/{ids}")
+    Observable<SuccessBean> doDelDispute(@Path("ids") String id, @Header("token") String token);
+
+    /**
+     * 根据ID获取详情
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/dispute/get/{disputeId}")
+    Observable<DisputeDetailBean> getDisputeDetailById(@Path("disputeId") String id, @Header("token") String token);
+
+
+    /**
+     * 矛盾纠纷
+     */
+    @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/dispute/listpagedispute")
+    Observable<DisputeBean> getDisputeList(@Query("populationInfoId") String id, @Query("page") String page, @Query("keywords") String key, @Header("token") String token);
+
     /*===========================================艾滋===========================================*/
 
     /**

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

@@ -0,0 +1,950 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:scrollbars="none">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/layout_search"
+            android:visibility="gone" />
+
+        <include layout="@layout/layout_base_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="矛盾纠纷"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="事件名称" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical" />
+
+                        <EditText
+                            android:id="@+id/et_case_name"
+                            style="@style/item_content_match"
+                            android:hint="请输入事件名称" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="事件标题" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical" />
+
+                        <EditText
+                            android:id="@+id/et_case_title"
+                            style="@style/item_content_match"
+                            android:hint="请输入事件标题" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="发生日期" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="visible" />
+
+                        <TextView
+                            android:id="@+id/tv_case_date"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择发生日期" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="发生地点" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical" />
+
+                        <TextView
+                            android:id="@+id/tv_case_address"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择发生地点" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="详细地址" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_detail_address"
+                            style="@style/item_content_match"
+                            android:hint="请输入详细地址" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            android:id="@+id/tv_loc_lng"
+                            style="@style/item_title_wrap"
+                            android:layout_width="match_parent"
+                            android:layout_gravity="center_vertical"
+                            android:drawableRight="@drawable/ic_arrow_sort_gray"
+                            android:text="地图位置(点击进行地图选址)" />
+
+
+                        <com.sucstepsoft.realtimelocation.widget.NoScrollMapView
+                            android:layout_width="match_parent"
+                            android:layout_height="200dp"
+                            android:layout_marginTop="5dp">
+
+                            <com.baidu.mapapi.map.TextureMapView
+                                android:id="@+id/mp_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+
+
+                        </com.sucstepsoft.realtimelocation.widget.NoScrollMapView>
+
+                        <TextView
+                            android:id="@+id/tv_point"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/gray_fa"
+                            android:padding="5dp"
+                            android:textColor="@color/black"
+                            tools:text="坐标:22222223413241234" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件规模" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_case_scale"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择事件规模" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件类别" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_case_type"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择事件类别" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="案件评估" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_case_assess"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择案件评估" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="激烈程度" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_case_degree"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择激烈程度" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="预警等级" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_case_level"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择预警等级" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="纠纷类型" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_dispute_type"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择纠纷类型" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="纠纷等级" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_dispute_level"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择纠纷等级" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="风险类型" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_risk_type"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择风险类型" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="风险等级" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_risk_level"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择风险等级" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="协议涉及金额" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_money"
+                            style="@style/item_content_match"
+                            android:hint="请输入涉及金额" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="涉及人员人数" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_person_num"
+                            style="@style/item_content_match"
+                            android:hint="请输入涉及人员人数" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="涉及单位" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_dept"
+                            style="@style/item_content_match"
+                            android:hint="请输入涉及单位" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="最后调解日期" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tv_compose_date"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择最后调解日期" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件详细描述" />
+
+
+                        <EditText
+                            android:id="@+id/et_reason_other"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="请输入事件详细描述"
+                            android:inputType="text"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_ver">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="现场照片" />
+
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/rlv_photo"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/shape_rectangle_gray_5" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="主要当事人"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件类型" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="visible" />
+
+                        <TextView
+                            android:id="@+id/tv_party_card_type"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择证件类型" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件号码" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_party_card_num"
+                            style="@style/item_content_match"
+                            android:hint="请输入证件号码" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="姓名" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_party_name"
+                            style="@style/item_content_match"
+                            android:hint="请输入姓名" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="联系电话" />
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:layout_gravity="center_vertical"
+                            android:visibility="gone" />
+
+                        <EditText
+                            android:id="@+id/et_party_phone"
+                            style="@style/item_content_match"
+                            android:hint="请输入联系电话" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="性别" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_sex"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择性别" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="民族" />
+
+                        <TextView
+                            android:id="@+id/tv_party_nation"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择民族" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="文化程度" />
+
+                        <TextView
+                            android:id="@+id/tv_party_edu"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择文化程度" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="人员类别" />
+
+                        <TextView
+                            android:id="@+id/tv_party_person_type"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择人员类别" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="居住地" />
+
+                        <TextView
+                            android:id="@+id/tv_party_person_address"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择居住地" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="化解"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="截止时间" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_date"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择截止时间" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解方式" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_way"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择化解方式" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解组织" />
+
+
+                        <EditText
+                            android:id="@+id/et_resolve_dept"
+                            style="@style/item_content_match"
+                            android:hint="请输入化解组织" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人姓名" />
+
+
+                        <EditText
+                            android:id="@+id/et_resolve_name"
+                            style="@style/item_content_match"
+                            android:hint="请输入化解负责人姓名" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人证件号码" />
+
+
+                        <EditText
+                            android:id="@+id/et_resolve_id_card"
+                            style="@style/item_content_match"
+                            android:hint="请输入化解负责人证件号码" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人联系电话" />
+
+
+                        <EditText
+                            android:id="@+id/et_resolve_phone"
+                            style="@style/item_content_match"
+                            android:hint="请输入化解负责人联系电话" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="是否化解成功" />
+
+
+                        <Switch
+                            android:id="@+id/sw_is_resolve"
+                            style="@style/item_switch"
+                            android:checked="true" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解结果" />
+
+
+                        <EditText
+                            android:id="@+id/et_resolve_result"
+                            style="@style/item_content_match"
+                            android:hint="请输入化解结果" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="考评"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="考评意见" />
+
+
+                        <EditText
+                            android:id="@+id/et_eva_advice"
+                            style="@style/item_content_match"
+                            android:hint="请输入考评意见" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="考评日期" />
+
+
+                        <TextView
+                            android:id="@+id/tv_eva_date"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择考评日期" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="措施手段"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="措施手段" />
+
+
+                        <EditText
+                            android:id="@+id/et_measure"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="请输入措施手段"
+                            android:inputType="text"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="工作记录"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="工作记录" />
+
+
+                        <EditText
+                            android:id="@+id/et_work_record"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="请输入工作记录"
+                            android:inputType="text"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="乙方当事人"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件号码" />
+
+
+                        <EditText
+                            android:id="@+id/et_party_b_num"
+                            style="@style/item_content_match"
+                            android:hint="请输入证件号码" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="姓名" />
+
+
+                        <EditText
+                            android:id="@+id/et_party_b_name"
+                            style="@style/item_content_match"
+                            android:hint="请输入姓名" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="联系电话" />
+
+
+                        <EditText
+                            android:id="@+id/et_party_b_phone"
+                            style="@style/item_content_match"
+                            android:hint="请输入联系电话" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btn_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="15dp"
+                android:background="@drawable/sel_btn_submit"
+                android:minHeight="0dp"
+                android:padding="10dp"
+                android:text="保&#160;&#160;&#160;&#160;存"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</android.support.v4.widget.NestedScrollView>

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

@@ -0,0 +1,814 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:scrollbars="none">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/layout_search"
+            android:visibility="gone" />
+
+        <include layout="@layout/layout_base_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="矛盾纠纷"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="事件名称" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_name"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="事件标题" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_title"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="发生日期" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_date"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="发生地点" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_address"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="详细地址" />
+
+
+                        <TextView
+                            android:id="@+id/tv_detail_address"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            android:id="@+id/tv_loc_lng"
+                            style="@style/item_title_wrap"
+                            android:layout_width="match_parent"
+                            android:layout_gravity="center_vertical"
+                            android:text="地图位置" />
+
+
+                        <com.sucstepsoft.realtimelocation.widget.NoScrollMapView
+                            android:layout_width="match_parent"
+                            android:layout_height="200dp"
+                            android:layout_marginTop="5dp">
+
+                            <com.baidu.mapapi.map.TextureMapView
+                                android:id="@+id/mp_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+
+
+                        </com.sucstepsoft.realtimelocation.widget.NoScrollMapView>
+
+                        <TextView
+                            android:id="@+id/tv_point"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/gray_fa"
+                            android:padding="5dp"
+                            android:textColor="@color/black"
+                            tools:text="坐标:22222223413241234" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件规模" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_scale"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件类别" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_type"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="案件评估" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_assess"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="激烈程度" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_degree"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="预警等级" />
+
+
+                        <TextView
+                            android:id="@+id/tv_case_level"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="纠纷类型" />
+
+
+                        <TextView
+                            android:id="@+id/tv_dispute_type"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="纠纷等级" />
+
+
+                        <TextView
+                            android:id="@+id/tv_dispute_level"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="风险类型" />
+
+
+                        <TextView
+                            android:id="@+id/tv_risk_type"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="风险等级" />
+
+
+                        <TextView
+                            android:id="@+id/tv_risk_level"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="协议涉及金额" />
+
+
+                        <TextView
+                            android:id="@+id/tv_money"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="涉及人员人数" />
+
+
+                        <TextView
+                            android:id="@+id/tv_person_num"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="涉及单位" />
+
+
+                        <TextView
+                            android:id="@+id/tv_dept"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="最后调解日期" />
+
+
+                        <TextView
+                            android:id="@+id/tv_compose_date"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="事件详细描述" />
+
+
+                        <TextView
+                            android:id="@+id/tv_reason_other"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="未录入"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_ver">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="现场照片" />
+
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/rlv_photo"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/shape_rectangle_gray_5" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="主要当事人"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件类型" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_card_type"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件号码" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_card_num"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="姓名" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_name"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="联系电话" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_phone"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="性别" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_sex"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="民族" />
+
+                        <TextView
+                            android:id="@+id/tv_party_nation"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="文化程度" />
+
+                        <TextView
+                            android:id="@+id/tv_party_edu"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="人员类别" />
+
+                        <TextView
+                            android:id="@+id/tv_party_person_type"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="居住地" />
+
+                        <TextView
+                            android:id="@+id/tv_party_person_address"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="化解"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="截止时间" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_date"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解方式" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_way"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解组织" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_dept"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人姓名" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_name"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人证件号码" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_id_card"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解负责人联系电话" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_phone"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="是否化解成功" />
+
+
+                        <Switch
+                            android:id="@+id/sw_is_resolve"
+                            style="@style/item_switch"
+                            android:enabled="false" />
+                    </LinearLayout>
+
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="化解结果" />
+
+
+                        <TextView
+                            android:id="@+id/tv_resolve_result"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="考评"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="考评意见" />
+
+
+                        <TextView
+                            android:id="@+id/tv_eva_advice"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="考评日期" />
+
+
+                        <TextView
+                            android:id="@+id/tv_eva_date"
+                            style="@style/sel_text_arrow_text" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="措施手段"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="措施手段" />
+
+
+                        <TextView
+                            android:id="@+id/tv_measure"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="未录入"
+                            android:inputType="text"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="工作记录"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_ver">
+
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:layout_gravity="center_vertical"
+                            android:text="工作记录" />
+
+
+                        <TextView
+                            android:id="@+id/tv_work_record"
+                            style="@style/item_content_match_ver_gray"
+                            android:hint="未录入"
+                            android:inputType="text"
+                            android:minHeight="80dp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    style="@style/issue_report_title"
+                    android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                    android:drawablePadding="5dp"
+                    android:padding="8dp"
+                    android:text="乙方当事人"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="证件号码" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_b_num"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="姓名" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_b_name"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_white_bottom_border">
+
+                        <TextView
+                            style="@style/item_title_wrap"
+                            android:text="联系电话" />
+
+
+                        <TextView
+                            android:id="@+id/tv_party_b_phone"
+                            style="@style/sel_text_arrow_text" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </LinearLayout>
+
+</android.support.v4.widget.NestedScrollView>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/xlv_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp" />
+</RelativeLayout>

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

@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="70dp"
         android:layout_marginRight="20dp">
 
 
@@ -28,7 +28,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="25dp"
             android:background="@drawable/shape_rectangle_white_20"
             android:orientation="vertical">
 
@@ -43,9 +43,8 @@
 
                 <ImageView
                     android:id="@+id/iv_user_icon"
-                    android:layout_width="wrap_content"
+                    android:layout_width="47dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="47dp"
-                    android:layout_marginLeft="15dp"
                     android:background="@drawable/ic_user_default" />
 
                 <LinearLayout
@@ -88,6 +87,7 @@
                         android:layout_marginTop="5dp"
                         android:textColor="@color/black"
                         android:textSize="13dp"
+                        android:visibility="gone"
                         tools:text="(在线)" />
                 </LinearLayout>
 
@@ -106,17 +106,17 @@
                 android:id="@+id/ll_func_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp">
 
                 <LinearLayout
                     android:id="@+id/ll_day_aviso"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical"
+                    android:orientation="vertical">
-                    android:padding="8dp">
 
                     <TextView
                         android:id="@+id/tv_aviso_num"
@@ -149,11 +149,9 @@
                     android:id="@+id/ll_history"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="8dp"
                     android:visibility="visible">
 
                     <TextView
@@ -187,11 +185,9 @@
                     android:id="@+id/ll_plan"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical"
+                    android:orientation="vertical">
-                    android:padding="8dp">
 
                     <TextView
                         android:id="@+id/tv_plan_num"
@@ -221,7 +217,7 @@
                 <LinearLayout
                     android:id="@+id/ll_address_list"
                     android:layout_width="0dp"
-                    android:layout_height="35dp"
+                    android:layout_height="38dp"
                     android:layout_weight="1"
                     android:background="@drawable/ic_maint_title_btn_left"
                     android:gravity="center"
@@ -240,7 +236,7 @@
                 <LinearLayout
                     android:id="@+id/ll_case_record"
                     android:layout_width="0dp"
-                    android:layout_height="35dp"
+                    android:layout_height="38dp"
                     android:layout_marginLeft="-20dp"
                     android:layout_weight="1"
                     android:background="@drawable/ic_maint_title_btn_right"
@@ -272,7 +268,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="20dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:layout_marginRight="20dp"
             android:visibility="visible">
 
@@ -281,10 +277,6 @@
                 android:id="@+id/rlv_funcs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginTop="7dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginBottom="20dp"
                 android:overScrollMode="never"
                 tools:itemCount="4"
                 tools:layoutManager="GridLayoutManager"
@@ -295,18 +287,32 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/rlv_funcs"
+                android:layout_marginTop="8dp"
                 android:orientation="vertical">
 
-                <TextView
+                <RelativeLayout
+                    android:id="@+id/rl_notice"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="wrap_content">
-                    android:drawableLeft="@drawable/ic_item_title_icon"
-                    android:drawablePadding="10dp"
-                    android:text="通知公告"
-                    android:textColor="@color/black"
-                    android:textSize="18dp"
-                    android:textStyle="bold" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableLeft="@drawable/ic_item_title_icon"
+                        android:drawablePadding="10dp"
+                        android:text="通知公告"
+                        android:textColor="@color/black"
+                        android:textSize="18dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:drawableRight="@drawable/ic_more_32"
+                        android:text="更多" />
+                </RelativeLayout>
 
                 <RelativeLayout
                     android:layout_width="match_parent"

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

@@ -1,219 +1,205 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/gray_fa"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:padding="10dp">
+
+    <com.baidu.mapapi.map.TextureMapView
+        android:id="@+id/tmv_map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white"
+        android:layout_margin="5dp"
-        android:gravity="center"
+        android:orientation="vertical">
-        android:orientation="horizontal"
-        android:padding="5dp">
-
-        <ImageView
-            android:id="@+id/iv_user_icon"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            tools:src="@drawable/ic_user_default" />
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_user_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/black"
-                android:textSize="18sp"
-                tools:text="姓名" />
-
-            <TextView
-                android:id="@+id/tv_user_department"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                tools:text="部门职位" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_cur_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="@dimen/text_15"
-            tools:text="2022年12月12日\n23:23:23" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="15dp"
-        android:layout_weight="1"
-        android:background="@color/white"
-        android:gravity="center|top"
-        android:orientation="vertical"
-        android:padding="5dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="left|center"
-            android:paddingLeft="3dp"
-            android:paddingTop="3dp"
-            android:text="规则"
-            android:textColor="@color/black"
-            android:textSize="@dimen/text_16" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
+            android:background="@color/white"
+            android:gravity="center"
             android:orientation="horizontal"
-            android:padding="8dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="签到时间区间:"
-                android:textColor="@color/black"
-                android:textSize="@dimen/text_14" />
-
-            <TextView
-                android:id="@+id/tv_in_time"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
-                android:textSize="14dp"
-                tools:text="23:00:00-24:00:00" />
-
-            <ImageView
-                android:id="@+id/iv_sign_in_state"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                tools:src="@drawable/ic_sign_late" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingRight="8dp"
-            android:paddingLeft="8dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="签退时间区间:"
-                android:textColor="@color/black"
-                android:textSize="14dp" />
-
-            <TextView
-                android:id="@+id/tv_out_time"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
-                android:textSize="14dp"
-                tools:text="23:00:00-24:00:00" />
-
-            <ImageView
-                android:id="@+id/iv_sign_out_state"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                tools:src="@drawable/ic_sign_normal" />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-
-                <com.baidu.mapapi.map.TextureMapView
-                    android:id="@+id/tmv_map"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-
-                <Button
-                    android:id="@+id/btn_reset_loc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignBottom="@id/tmv_map"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="15dp"
-                    android:layout_marginBottom="15dp"
-                    android:background="@drawable/bm_btn_background"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:visibility="visible" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/tv_cur_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:drawableLeft="@drawable/ic_location_blue"
-                android:gravity="center"
-                android:padding="5dp"
-                android:text="正在定位中..." />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/ll_sign"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/sel_cir_btn_blue_gray"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center"
-            android:orientation="vertical"
             android:padding="5dp">
 
             <ImageView
-                android:id="@+id/iv_state"
+                android:id="@+id/iv_user_icon"
-                android:layout_width="wrap_content"
+                android:layout_width="50dp"
-                android:layout_height="wrap_content" />
+                android:layout_height="50dp"
+                tools:src="@drawable/ic_user_default" />
 
-            <TextView
+            <LinearLayout
-                android:id="@+id/tv_state"
+                android:layout_width="0dp"
-                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
-                android:layout_centerInParent="true"
+                android:layout_weight="1"
-                android:textColor="@color/white"
+                android:gravity="center"
-                android:textSize="16sp"
+                android:orientation="vertical">
-                tools:text="今日完成" />
+
+                <TextView
+                    android:id="@+id/tv_user_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:textSize="18sp"
+                    tools:text="姓名" />
+
+                <TextView
+                    android:id="@+id/tv_user_department"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    tools:text="部门职位" />
+            </LinearLayout>
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:background="@drawable/shape_rectangle_white"
+            android:gravity="center|top"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+            <TextView
+                android:id="@+id/tv_cur_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_15"
+                tools:text="2022年12月12日23:23:23" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:background="@color/gray_ef" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="签到时间区间:"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_14" />
+
+                <TextView
+                    android:id="@+id/tv_in_time"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_weight="1"
+                    android:textSize="14dp"
+                    tools:text="23:00:00-24:00:00" />
+
+                <ImageView
+                    android:id="@+id/iv_sign_in_state"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    tools:src="@drawable/ic_sign_late" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="签退时间区间:"
+                    android:textColor="@color/black"
+                    android:textSize="14dp" />
+
+                <TextView
+                    android:id="@+id/tv_out_time"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_weight="1"
+                    android:textSize="14dp"
+                    tools:text="23:00:00-24:00:00" />
+
+                <ImageView
+                    android:id="@+id/iv_sign_out_state"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    tools:src="@drawable/ic_sign_normal" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_cur_location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:background="@drawable/shape_rectangle_white"
+            android:drawableLeft="@drawable/ic_location_blue"
+            android:gravity="center"
+            android:padding="10dp"
+            android:text="正在定位中..." />
     </LinearLayout>
-</LinearLayout>
+
+
+    <Button
+        android:id="@+id/btn_reset_loc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/bm_btn_background"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/ll_sign"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/sel_cir_btn_blue_gray"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="5dp">
+
+        <ImageView
+            android:id="@+id/iv_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/tv_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            tools:text="今日完成" />
+
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_rectangle_white"
+    android:orientation="vertical"
+    tools:background="@color/gray_bg">
+
+
+    <TextView
+        android:id="@+id/tv_notice_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textColor="#ff353535"
+        android:textSize="16dp"
+        tools:text="标题" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <TextView
+            android:id="@+id/tv_notice_gator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="#ff808080"
+            android:textSize="12dp"
+            tools:text="张三" />
+
+        <TextView
+            android:id="@+id/tv_notice_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:textColor="#ff808080"
+            android:textSize="12dp"
+            tools:text="2019年01月01日 10:09:09" />
+
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/gray_ef" />
+</LinearLayout>

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -115,11 +115,11 @@ public class PathConfig {
     public static final String DIC_STABILIZE_STATUS = "8d4f4133-41d7-4564-97fc-55313e4d1a80";
     public static final String DIC_STABILIZE_LEVEL = "fef0db2c-0f2a-4b2a-ba6d-a389a89f24bb";
     public static final String DIC_UP_REASON = "f1a70443-47ae-4d0e-9d33-44b0a902343e";
-    public static final String DIC_UP_TYPE="02473db5-575c-487b-9df8-3fae9d66ac8b";
+    public static final String DIC_UP_TYPE = "02473db5-575c-487b-9df8-3fae9d66ac8b";
     public static final String DIC_ONDUTY = "ae674cf5-2b10-424c-8120-39dd7edf9483";
     public static final String DIC_HANDLE = "66923b65-acbb-487b-8893-bfcf26d36028";
-    public static final String DIC_COORD="0a0060a9-0136-4a5a-ae01-6e6654426be4";
+    public static final String DIC_COORD = "0a0060a9-0136-4a5a-ae01-6e6654426be4";
-    public static final String DIC_TALK="3d6a1b33-5cdd-4c60-b5ef-39a8019e6c2e";
+    public static final String DIC_TALK = "3d6a1b33-5cdd-4c60-b5ef-39a8019e6c2e";
     /**
      * 请假外出市五区外
      */
@@ -276,5 +276,16 @@ public class PathConfig {
     public static final String ACTION_PUSH_STOP_SOCKET = "com.tengshisoft.zonemanagement.push_stop";//关闭socket
 
 
+    public static final String DIC_CASE_SCALE = "075f2815-4e7d-478c-837d-a826810e7383";//事件规模
+    public static final String DIC_CASE_CATE = "698e0684-b245-403b-9df9-c10eee1b465b";//矛盾纠纷-事件类别
+    public static final String DIC_CASE_ASSESS = "e1b8a4cf-90be-4597-a45d-cd520f6b37ee";//事件评估
 
+    public static final String DIC_CASE_DEGREE = "2e935031-a0a1-491d-a929-2dddc73a2bc5";//激烈程度
+    public static final String DIC_CASE_LEVEL = "2dd15c18-8876-4daa-b975-429e9e928ccd";//预警等级
+    public static final String DIC_DISPUTE_LEVEL = "12a83f99-2d4a-4587-9f36-2b88367bdbbd";//纠纷等级
+    public static final String DIC_DISPUTE_TYPE = "9e14d62a-d82c-4926-a769-7a1feec6e75e";//纠纷类型
+    public static final String DIC_RISK_LEVEL = "f154f475-4953-4d47-9ecc-f4be8c11e3ba";//风险等级
+    public static final String DIC_RISK_TYPE = "793bbd90-bab5-44a1-b78f-aead61411ef6";//风险类型
+    public static final String DIC_PERSON_TYPE = "d327f3b1-7c5f-4b4f-94fb-78158096ccc6";//当事人人员类别
+    public static final String DIC_RESOLVE_WAY = "68b0ec93-3981-4c12-bff6-0ae718bd0a9a";//化解方式
 }

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java

@@ -24,7 +24,7 @@ public class BaseUrlApi {
     public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/
     //    public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/
 //    public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/
-    public static final String BASE_POPULATION_IP = "http://192.168.0.115:7023/population/";/*人口系统  测试*/
+    public static final String BASE_POPULATION_IP = "http://192.168.0.9:7023/population/";/*人口系统  测试*/
     //    public static final String BASE_POPULATION_IP = "http://192.168.0.15:7023/population/";/*人口系统*/
     public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/";
     public static final String SOCKET_IP = BASE_IP_P + "social/appws";/*SocketIP*/

cm_utils/src/main/res/layout/dialog_choose_func.xml

@@ -37,6 +37,31 @@
                 android:textSize="12sp" />
 
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_build"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:background="@drawable/shp_rectangle_gray"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+            <ImageView
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/ic_build" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="房屋管理"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+        </LinearLayout>
 
 
         <LinearLayout
@@ -45,6 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:layout_weight="1"
+            android:visibility="gone"
             android:background="@drawable/shp_rectangle_gray"
             android:gravity="center"
             android:orientation="vertical"
@@ -135,9 +161,9 @@
         android:visibility="visible">
 
         <LinearLayout
-            android:id="@+id/ll_build"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:layout_margin="5dp"
             android:layout_weight="1"
             android:background="@drawable/shp_rectangle_gray"