diff --git a/README.md b/README.md index 3fbcb03..53b7717 100755 --- a/README.md +++ b/README.md @@ -57,3 +57,12 @@ 1.人口房屋录入 ``` + +## 2023-11-22 +``` +> 1.5.1 + +1.案件上报、详情页面修改 +2.以人找房 以房找人 + +``` diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueCheckActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueCheckActivity.java index 422d046..41a7b8b 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueCheckActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueCheckActivity.java @@ -154,6 +154,7 @@ public class IssueCheckActivity extends BaseActivity { private void showDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); //待处理处理 + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("mine", "1"); intent.putExtra("bean", bean); if (bean.getCaseStatus().equals("4")) { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java index 40f9fe9..ac96d21 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java @@ -3,7 +3,6 @@ package com.sucstepsoft.realtimelocation.activitys.issue; import android.app.ProgressDialog; import android.content.Intent; import android.database.Cursor; -import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; import android.net.Uri; import android.os.Build; @@ -21,7 +20,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RadioGroup; -import android.widget.RelativeLayout; import android.widget.Switch; import android.widget.TextView; import android.widget.ZoomControls; @@ -53,10 +51,11 @@ import com.sucstepsoft.realtimelocation.R; import com.sucstepsoft.realtimelocation.activitys.common.PhotoActivity; import com.sucstepsoft.realtimelocation.beans.BaseUserBean; import com.sucstepsoft.realtimelocation.beans.IssueCheckBean; +import com.sucstepsoft.realtimelocation.beans.IssueDetailBean; import com.sucstepsoft.realtimelocation.beans.IssueDisBean; -import com.sucstepsoft.realtimelocation.beans.IssueSubBean; import com.sucstepsoft.realtimelocation.beans.SuccessBean; import com.sucstepsoft.realtimelocation.net.LocationApiService; +import com.sucstepsoft.realtimelocation.utils.ExceptionHandler; import java.io.File; import java.util.ArrayList; @@ -124,8 +123,6 @@ public class IssueDetailActivity extends BaseActivity { TextView mTvHandleTime; @BindView(R.id.btn_reload) Button mBtnReload; - @BindView(R.id.rl_accept) - RelativeLayout mRlAccept; @BindView(R.id.ll_voice) LinearLayout mLlVoice; @BindView(R.id.tv_voice_anim) @@ -138,8 +135,11 @@ public class IssueDetailActivity extends BaseActivity { Button mBtnReturn; @BindView(R.id.tv_grade) TextView mTvGrade; + @BindView(R.id.ll_grade) + LinearLayout mLlGradeContent; private Unbinder mBind; - private IssueSubBean.RowsBean mRowsBean; + // private IssueSubBean.RowsBean mRowsBean; + private IssueDetailBean mDetailBean; private List mPhotos = new ArrayList<>(); private AddPhotoBean mCurrentBean; private String mPicPath; @@ -149,6 +149,7 @@ public class IssueDetailActivity extends BaseActivity { private String mCheck; private boolean isSelf = false;//是否是自处理 private String mDegree = "4";//满意度 + private String mId; @Override protected int setLayoutId() { @@ -158,12 +159,17 @@ public class IssueDetailActivity extends BaseActivity { @Override public void initData() { mBind = ButterKnife.bind(this); - refreshView(STATE_LOAD_SUCCESS); + refreshView(STATE_LOAD_LOADING); mTvBaseTitle.setText("上报详情"); mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("流程"); - mRowsBean = (IssueSubBean.RowsBean) getIntent().getSerializableExtra("bean"); - getDetail(mRowsBean); + mId = getIntent().getStringExtra("id"); + if (TextUtils.isEmpty(mId)) { + ToastUtils.showShort("数据有误"); + finish(); + } else { + getDetail(mId); + } String mine = getIntent().getStringExtra("mine"); mCheck = getIntent().getStringExtra("check"); if (TextUtils.isEmpty(mCheck)) { @@ -181,10 +187,9 @@ public class IssueDetailActivity extends BaseActivity { } else { mLlIssueDis.setVisibility(View.GONE); } - setDetailDataToView(); mTvPublish.setOnClickListener(v -> { Intent intent = new Intent(IssueDetailActivity.this, IssueStepActivity.class); - intent.putExtra("caseId", mRowsBean.getReportCaseId()); + intent.putExtra("caseId", mId); startActivity(intent); }); View child = mMapView.getChildAt(1); @@ -195,35 +200,36 @@ public class IssueDetailActivity extends BaseActivity { setEditTextInhibitInputSpeChat(mEtIssueDisDesc); } - private void getDetail(IssueSubBean.RowsBean rowsBean) { - if (rowsBean != null) { - RetrofitManager.getInstance() - .create(LocationApiService.class) - .getIssueDetail(rowsBean.getReportCaseId(), UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + private void getDetail(String id) { + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getIssueDetail(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(Object o) { + @Override + public void onNext(IssueDetailBean o) { + mDetailBean = o; + refreshView(STATE_LOAD_SUCCESS); + setDetailDataToView(); + } - } + @Override + public void onError(Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } - @Override - public void onError(Throwable e) { + @Override + public void onComplete() { - } - - @Override - public void onComplete() { - - } - }); - } + } + }); } /** @@ -315,9 +321,9 @@ public class IssueDetailActivity extends BaseActivity { */ private void doTrans() { Intent intent = new Intent(mActivity, IssueTransActivity.class); - intent.putExtra("caseId", mRowsBean.getReportCaseId()); - intent.putExtra("communityName", mRowsBean.getCommunityName()); - intent.putExtra("areaName", mRowsBean.getAreaName()); + intent.putExtra("caseId", mDetailBean.getReportCaseId()); + intent.putExtra("communityName", mDetailBean.getCommunityName()); + intent.putExtra("areaName", mDetailBean.getAreaName()); startActivityForResult(intent, 19); } @@ -329,7 +335,7 @@ public class IssueDetailActivity extends BaseActivity { dialog.show(); RetrofitManager.getInstance() .create(LocationApiService.class) - .returnIssueDis(mRowsBean.getReportCaseId(), UserLgUtils.getToken()) + .returnIssueDis(mDetailBean.getReportCaseId(), UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -386,7 +392,7 @@ public class IssueDetailActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() .create(LocationApiService.class) - .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .saveIssueInspect(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -475,7 +481,7 @@ public class IssueDetailActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() .create(LocationApiService.class) - .saveIssueDis(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .saveIssueDis(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -593,7 +599,7 @@ public class IssueDetailActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() .create(LocationApiService.class) - .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .saveIssueInspect(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -628,15 +634,15 @@ public class IssueDetailActivity extends BaseActivity { } private void setDetailDataToView() { - if (mRowsBean != null) { + if (mDetailBean != null) { //TODO 处理满意度 - LogUtils.e(mRowsBean.getGrade()); - if (TextUtils.isEmpty(mRowsBean.getGrade()) || "0".equals(mRowsBean.getGrade())) { - mTvGrade.setVisibility(View.GONE); + LogUtils.e(mDetailBean.getGrade()); + if (TextUtils.isEmpty(mDetailBean.getGrade()) || "0".equals(mDetailBean.getGrade())) { + mLlGradeContent.setVisibility(View.GONE); } else { - mTvGrade.setVisibility(View.VISIBLE); + mLlGradeContent.setVisibility(View.VISIBLE); String grade = "满意"; - switch (mRowsBean.getGrade()) { + switch (mDetailBean.getGrade()) { case "1": grade = "非常不满意"; break; @@ -653,10 +659,10 @@ public class IssueDetailActivity extends BaseActivity { grade = "非常满意"; break; } - mTvGrade.setText("处理满意度:" + grade); + mTvGrade.setText(grade); } //区域 - if (0 == mRowsBean.getIsSelf()) { + if (0 == mDetailBean.getIsSelf()) { isSelf = false; //mRlAccept.setVisibility(View.VISIBLE); } else { @@ -665,73 +671,55 @@ public class IssueDetailActivity extends BaseActivity { //isAccept = true; //mRlAccept.setVisibility(View.GONE); } - mTvUpOrg.setText(mRowsBean.getCommunityName()); + mTvUpOrg.setText(mDetailBean.getCommunityName()); //状态 //描述 - mTvIssueDesc.setText(mRowsBean.getCaseContent()); + mTvIssueDesc.setText(mDetailBean.getCaseContent()); //上报时间 - mTvUpTime.setText("上报时间:" + mRowsBean.getReportDate()); + mTvUpTime.setText(mDetailBean.getReportDate()); //类型 - mTvType.setText("上报类型:" + mRowsBean.getCaseTypeName()); + mTvType.setText("上报类型:" + mDetailBean.getCaseTypeName()); //上报人 - mTvUpUser.setText("上报人员:" + mRowsBean.getCaseReporter()); - if (!TextUtils.isEmpty(mRowsBean.getCaseAudio())) { + mTvUpUser.setText("上报人员:" + mDetailBean.getCaseReporter()); + if (!TextUtils.isEmpty(mDetailBean.getCaseAudio())) { mLlVoice.setVisibility(View.VISIBLE); - mLlVoice.setOnClickListener(v -> playVoice(mRowsBean.getCaseAudio())); + mLlVoice.setOnClickListener(v -> playVoice(mDetailBean.getCaseAudio())); } else { mLlVoice.setVisibility(View.GONE); } - if (!TextUtils.isEmpty(mRowsBean.getCaseStatus())) { - switch (mRowsBean.getCaseStatus()) { + if (!TextUtils.isEmpty(mDetailBean.getCaseStatus())) { + switch (mDetailBean.getCaseStatus()) { case "0"://待受理 mTvState.setText("待受理"); - mTvState.setTextColor(Color.parseColor("#DE0E0E")); - mTvState.setBackgroundResource(R.drawable.shp_status_red); break; case "1": mTvState.setText("待立案"); - mTvState.setTextColor(Color.parseColor("#DE0E0E")); - mTvState.setBackgroundResource(R.drawable.shp_status_red); break; case "2": mTvState.setText("待下派"); - mTvState.setTextColor(Color.parseColor("#FFAE3B")); - mTvState.setBackgroundResource(R.drawable.shp_status_yellow); break; case "3": mTvState.setText("待处理"); - mTvState.setTextColor(Color.parseColor("#DE0E0E")); - mTvState.setBackgroundResource(R.drawable.shp_status_red); break; case "4": mTvState.setText("待检查"); - mTvState.setTextColor(Color.parseColor("#1189FF")); - mTvState.setBackgroundResource(R.drawable.shp_status_blue); break; case "5": mTvState.setText("待结案"); - mTvState.setTextColor(Color.parseColor("#0EC843")); - mTvState.setBackgroundResource(R.drawable.shp_status_green); break; case "6": mTvState.setText("已归档"); - mTvState.setTextColor(Color.parseColor("#D8D8D8")); - mTvState.setBackgroundResource(R.drawable.shp_status_gray); break; default: mTvState.setText("异常"); - mTvState.setTextColor(Color.parseColor("#DE0E0E")); - mTvState.setBackgroundResource(R.drawable.shp_status_red); break; } } else { mTvState.setText("异常"); - mTvState.setTextColor(Color.parseColor("#DE0E0E")); - mTvState.setBackgroundResource(R.drawable.shp_status_red); } - mTvIssueAddress.setText(mRowsBean.getCasePosition()); - String caseLongitude = mRowsBean.getCaseLongitude(); - String caseLatitude = mRowsBean.getCaseLatitude(); + mTvIssueAddress.setText(mDetailBean.getCasePosition()); + String caseLongitude = mDetailBean.getCaseLongitude(); + String caseLatitude = mDetailBean.getCaseLatitude(); if (!TextUtils.isEmpty(caseLatitude) && !TextUtils.isEmpty(caseLongitude)) { Double l = Double.parseDouble(caseLongitude); Double a = Double.parseDouble(caseLatitude); @@ -747,10 +735,10 @@ public class IssueDetailActivity extends BaseActivity { map.addOverlay(markerOptions); mBtnReload.setOnClickListener(v -> map.animateMapStatus(MapStatusUpdateFactory.newMapStatus(ms))); } - if (!TextUtils.isEmpty(mRowsBean.getCasePhotos())) { + if (!TextUtils.isEmpty(mDetailBean.getCasePhotos())) { mRlvPhotos.setVisibility(View.VISIBLE); List photos = new ArrayList<>(); - String[] split = mRowsBean.getCasePhotos().split(","); + String[] split = mDetailBean.getCasePhotos().split(","); for (int i = 0; i < split.length; i++) { if (!TextUtils.isEmpty(split[i])) { photos.add(BaseUrlApi.BASE_IMG_URL + split[i]); @@ -775,15 +763,15 @@ public class IssueDetailActivity extends BaseActivity { } //TODO 填充处理数据 if (!TextUtils.isEmpty(mCheck)) { - mTvHandleTime.setText("处理时间:" + mRowsBean.getHandleDate()); - mTvHandleUser.setText("处理人:" + mRowsBean.getHandleUserName()); - mTvIssueDisDesc.setText(mRowsBean.getHandleOpinion()); - if (TextUtils.isEmpty(mRowsBean.getHandlePhotos())) { + mTvHandleTime.setText(mDetailBean.getHandleCreateTime()); + mTvHandleUser.setText(mDetailBean.getHandleUserName()); + mTvIssueDisDesc.setText(mDetailBean.getHandleOpinion()); + if (TextUtils.isEmpty(mDetailBean.getHandlePhotos())) { mRlvDisPhoto.setVisibility(View.GONE); } else { mRlvDisPhoto.setVisibility(View.VISIBLE); List photos = new ArrayList<>(); - String[] split = mRowsBean.getHandlePhotos().split(","); + String[] split = mDetailBean.getHandlePhotos().split(","); for (int i = 0; i < split.length; i++) { if (!TextUtils.isEmpty(split[i])) { photos.add(BaseUrlApi.BASE_IMG_URL + split[i]); diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueInspectActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueInspectActivity.java index 849f64b..c9e84dd 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueInspectActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueInspectActivity.java @@ -155,6 +155,7 @@ public class IssueInspectActivity extends BaseActivity { private void showDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); //待处理处理 + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("mine", "1"); intent.putExtra("bean", bean); if (bean.getCaseStatus().equals("4")) { diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineActivity.java index d27166d..63e2071 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineActivity.java @@ -94,6 +94,7 @@ public class IssueMineActivity extends BaseActivity { */ private void showDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("bean", bean); startActivity(intent); } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineDisActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineDisActivity.java index 097ce2c..9cb3efd 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineDisActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineDisActivity.java @@ -89,7 +89,9 @@ public class IssueMineDisActivity extends BaseActivity { */ private void showDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(IssueMineDisActivity.this, IssueDetailActivity.class); + intent.putExtra("mine", "1"); + intent.putExtra("id", bean.getReportCaseId()); intent.putExtra("bean", bean); startActivity(intent); } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java index c6ebe1f..9047fe4 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java @@ -11,7 +11,6 @@ import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; import android.net.Uri; import android.os.Build; -import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; import android.support.v4.content.FileProvider; @@ -96,6 +95,8 @@ public class IssueReportActivity extends BaseActivity { EditText mEtIssueDesc; @BindView(R.id.rlv_locale_photo) RecyclerView mRlvLocalePhoto; + @BindView(R.id.ll_case_type) + LinearLayout mLlCaseType; @BindView(R.id.btn_submit) Button mBtnSubmit; @BindView(R.id.arb_audio) @@ -106,16 +107,16 @@ public class IssueReportActivity extends BaseActivity { LinearLayout mLlVoice; @BindView(R.id.tv_source_content) TextView mTvSourceContent; - @BindView(R.id.tv_issue_detail_info) - TextView mTvIssueDInfo; - @BindView(R.id.tv_issue_base_info) - TextView mTvIssueBaseInfo; + // @BindView(R.id.tv_issue_detail_info) +// TextView mTvIssueDInfo; +// @BindView(R.id.tv_issue_base_info) +// TextView mTvIssueBaseInfo; @BindView(R.id.sw_is_self) Switch mSwIsSelf; @BindView(R.id.tv_case_type) TextView mTvCaseType; - @BindView(R.id.ll_case_type) - LinearLayout mLlCaseType; + // @BindView(R.id.ll_case_type) +// LinearLayout mLlCaseType; private Unbinder mBind; private List mPhotos = new ArrayList<>(); private AddPhotoBean mCurrentBean; @@ -168,34 +169,34 @@ public class IssueReportActivity extends BaseActivity { private void getUserArea() { RetrofitManager.getInstance() - .create(LocationApiService.class) - .getUserDepartment(UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .getUserDepartment(UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { - } - - @Override - public void onNext(List userDepartmentBeans) { - if (userDepartmentBeans != null && userDepartmentBeans.size() > 0) { - mUserDepartmentBean = userDepartmentBeans.get(0); } - getAreaList(0); - } - @Override - public void onError(Throwable e) { - getAreaList(0); - } + @Override + public void onNext(List userDepartmentBeans) { + if (userDepartmentBeans != null && userDepartmentBeans.size() > 0) { + mUserDepartmentBean = userDepartmentBeans.get(0); + } + getAreaList(0); + } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + getAreaList(0); + } - } - }); + @Override + public void onComplete() { + + } + }); } /** @@ -265,11 +266,11 @@ public class IssueReportActivity extends BaseActivity { AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); animationDrawable.start(); MediaManager.playSound(mVideoPath, - mp -> { - animationDrawable.selectDrawable(0);//显示动画第一帧 - animationDrawable.stop(); - MediaManager.destroy(); - }); + mp -> { + animationDrawable.selectDrawable(0);//显示动画第一帧 + animationDrawable.stop(); + MediaManager.destroy(); + }); } else { LogUtils.e("" + mVideoPath); } @@ -322,10 +323,10 @@ public class IssueReportActivity extends BaseActivity { mTvCaseType.setText(bean.getDictName()); mSelCaseType = bean.getDictId(); }).setTitleText("请选择类型") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mCaseTypePicker.setPicker(mCaseTypeList); } mCaseTypePicker.show(); @@ -370,11 +371,11 @@ public class IssueReportActivity extends BaseActivity { } mTvSourceContent.setText(mSources.get(options1)); }) - .setTitleText("请选择来源") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择来源") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mSourcePicker.setPicker(mSources); } mSourcePicker.show(); @@ -389,34 +390,34 @@ public class IssueReportActivity extends BaseActivity { ProgressDialog progressDialog = UIUtil.initDialog(IssueReportActivity.this, "案件上报中..."); progressDialog.show(); RetrofitManager.getInstance() - .create(LocationApiService.class) - .doReportIssue(requestBody, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .doReportIssue(requestBody, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(SuccessBean s) { - progressDialog.dismiss(); - ToastUtils.showShort("上报成功"); - finish(); - } + @Override + public void onNext(SuccessBean s) { + progressDialog.dismiss(); + ToastUtils.showShort("上报成功"); + finish(); + } - @Override - public void onError(Throwable e) { - progressDialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(Throwable e) { + progressDialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -445,11 +446,11 @@ public class IssueReportActivity extends BaseActivity { return null; } //案件分类 - if (!isSelf) { - if (TextUtils.isEmpty(mSelCaseType)) { - ToastUtils.showShort("请选择案件分类"); - } - } +// if (!isSelf) { +// if (TextUtils.isEmpty(mSelCaseType)) { +// ToastUtils.showShort("请选择案件分类"); +// } +// } String desc = mEtIssueDesc.getText().toString().trim(); if (TextUtils.isEmpty(desc)) { ToastUtils.showShort("请输入案件描述"); @@ -548,43 +549,43 @@ public class IssueReportActivity extends BaseActivity { RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); MultipartBody.Part body = MultipartBody.Part.createFormData("audio", file.getName(), requestFile); RetrofitManager.getInstance() - .create(LocationApiService.class) - .uploadVideo(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .uploadVideo(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } - - @Override - public void onNext(BaseUserBean baseUserBean) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); } - ToastUtils.showShort("上传成功"); - mVideoPath = filePath; - mVideoId = baseUserBean.getData(); - mTvVoiceAnim.setVisibility(View.VISIBLE); - } - @Override - public void onError(Throwable e) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); + @Override + public void onNext(BaseUserBean baseUserBean) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传成功"); + mVideoPath = filePath; + mVideoId = baseUserBean.getData(); + mTvVoiceAnim.setVisibility(View.VISIBLE); } - ToastUtils.showShort("上传失败,请稍后重试."); - if (file.exists()) { - file.delete(); + + @Override + public void onError(Throwable e) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传失败,请稍后重试."); + if (file.exists()) { + file.delete(); + } } - } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } else { progressDialog.dismiss(); ToastUtils.showShort("录音文件路径有误."); @@ -608,10 +609,10 @@ public class IssueReportActivity extends BaseActivity { ToastUtils.showShort("请选择案件类型"); } }).setTitleText("请选择类型") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mTypePicker.setPicker(mTypeList, mTypeSubBenas); } mTypePicker.show(); @@ -625,41 +626,41 @@ public class IssueReportActivity extends BaseActivity { */ private void getCaseTypeList(int i) { RetrofitManager.getInstance() - .create(LocationApiService.class) - .getDictListAll("46d108b2-4ef9-4f6f-b30c-0c700e3ee852", UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { - mCaseTypeDis = d; - } - - @Override - public void onNext(List areaListBeans) { - if (null != areaListBeans && areaListBeans.size() > 0) { - mTypeList = areaListBeans; - if (mTypeList.get(0).getSubDicts() != null && mTypeList.get(0).getSubDicts().size() > 0) { - mSelTypeBean = mTypeList.get(0); - mSelTypeSubBean = mTypeList.get(0).getSubDicts().get(0); - mTvTypeContent.setText(mSelTypeBean.getDictName() + " - " + mSelTypeSubBean.getDictName()); - } - buildTypelistDatas(areaListBeans, i); - } else { - ToastUtils.showShort("暂无类别数据"); + .create(LocationApiService.class) + .getDictListAll("46d108b2-4ef9-4f6f-b30c-0c700e3ee852", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + mCaseTypeDis = d; } - } - @Override - public void onError(Throwable e) { - LogUtils.e(e); - } + @Override + public void onNext(List areaListBeans) { + if (null != areaListBeans && areaListBeans.size() > 0) { + mTypeList = areaListBeans; + if (mTypeList.get(0).getSubDicts() != null && mTypeList.get(0).getSubDicts().size() > 0) { + mSelTypeBean = mTypeList.get(0); + mSelTypeSubBean = mTypeList.get(0).getSubDicts().get(0); + mTvTypeContent.setText(mSelTypeBean.getDictName() + " - " + mSelTypeSubBean.getDictName()); + } + buildTypelistDatas(areaListBeans, i); + } else { + ToastUtils.showShort("暂无类别数据"); + } + } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + LogUtils.e(e); + } - } - }); + @Override + public void onComplete() { + + } + }); } private List> mTypeSubBenas = new ArrayList<>(); @@ -691,67 +692,67 @@ public class IssueReportActivity extends BaseActivity { } RetrofitManager.getInstance() - .create(LocationApiService.class) - .getDictList("9d179f05-3ea0-48f7-853c-d3b7124b791c", UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { - mDictDis = d; - } - - @Override - public void onNext(List areaListBeans) { - if (mProgressDialog != null && mProgressDialog.isShowing()) { - mProgressDialog.dismiss(); + .create(LocationApiService.class) + .getDictList("9d179f05-3ea0-48f7-853c-d3b7124b791c", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + mDictDis = d; } - if (null != areaListBeans && areaListBeans.size() > 0) { - mAreaList = areaListBeans; - if (i == 0) { - if (mUserDepartmentBean != null) { - for (int j = 0; j < areaListBeans.size(); j++) { - if (areaListBeans.get(j).getDictId().equals(mUserDepartmentBean.getAreaId())) { - mTvAreaContent.setText(mAreaList.get(j).getDictName()); - mSelectAreaBean = mAreaList.get(j); - break; - } else { - mTvAreaContent.setText(mAreaList.get(0).getDictName()); - mSelectAreaBean = mAreaList.get(0); + + @Override + public void onNext(List areaListBeans) { + if (mProgressDialog != null && mProgressDialog.isShowing()) { + mProgressDialog.dismiss(); + } + if (null != areaListBeans && areaListBeans.size() > 0) { + mAreaList = areaListBeans; + if (i == 0) { + if (mUserDepartmentBean != null) { + for (int j = 0; j < areaListBeans.size(); j++) { + if (areaListBeans.get(j).getDictId().equals(mUserDepartmentBean.getAreaId())) { + mTvAreaContent.setText(mAreaList.get(j).getDictName()); + mSelectAreaBean = mAreaList.get(j); + break; + } else { + mTvAreaContent.setText(mAreaList.get(0).getDictName()); + mSelectAreaBean = mAreaList.get(0); + } } + } else { + mTvAreaContent.setText(mAreaList.get(0).getDictName()); + mSelectAreaBean = mAreaList.get(0); } + getCommunityList(mSelectAreaBean.getDictId(), 0); } else { mTvAreaContent.setText(mAreaList.get(0).getDictName()); mSelectAreaBean = mAreaList.get(0); + getCommunityList(mAreaList.get(0).getDictId(), 0); + } + if (i == 1) { + onShowAreaPicker(); } - getCommunityList(mSelectAreaBean.getDictId(), 0); } else { - mTvAreaContent.setText(mAreaList.get(0).getDictName()); - mSelectAreaBean = mAreaList.get(0); - getCommunityList(mAreaList.get(0).getDictId(), 0); + + ToastUtils.showShort("暂无区域数据"); } - if (i == 1) { - onShowAreaPicker(); + } + + @Override + public void onError(Throwable e) { + if (mProgressDialog != null && mProgressDialog.isShowing()) { + mProgressDialog.dismiss(); } - } else { - - ToastUtils.showShort("暂无区域数据"); + ToastUtils.showShort("获取区域失败"); } - } - @Override - public void onError(Throwable e) { - if (mProgressDialog != null && mProgressDialog.isShowing()) { - mProgressDialog.dismiss(); + @Override + public void onComplete() { + } - ToastUtils.showShort("获取区域失败"); - } - - @Override - public void onComplete() { - - } - }); + }); } /** @@ -767,11 +768,11 @@ public class IssueReportActivity extends BaseActivity { mSelectAreaBean = mAreaList.get(options1); getCommunityList(mSelectAreaBean.getDictId(), 1); }) - .setTitleText("请选择区域") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择区域") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mAreaPicker.setPicker(mAreaList); mAreaPicker.show(); } @@ -789,36 +790,44 @@ public class IssueReportActivity extends BaseActivity { mProgressDialog.show(); } RetrofitManager.getInstance() - .create(LocationApiService.class) - .getCommunityList(areaId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { - mCommunityDis = d; - } - - @Override - public void onNext(List communityBeans) { - if (null != mProgressDialog && mProgressDialog.isShowing()) { - mProgressDialog.dismiss(); + .create(LocationApiService.class) + .getCommunityList(areaId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + mCommunityDis = d; } - if (null != communityBeans && communityBeans.size() > 0) { - if (i == 0) { - //第一次 - if (mUserDepartmentBean != null && !TextUtils.isEmpty(mUserDepartmentBean.getCommunityIds())) { - for (int j = 0; j < communityBeans.size(); j++) { - if (mUserDepartmentBean.getCommunityIds().contains(communityBeans.get(j).getCommunityId())) { - LogUtils.e("=社区匹配到了="); - mCommunityList = communityBeans; - mTvCommContent.setText(communityBeans.get(j).getCommunityName()); - mSelectCommBean = mCommunityList.get(j); - break; - } else { - mCommunityList = communityBeans; - mTvCommContent.setText(communityBeans.get(0).getCommunityName()); - mSelectCommBean = mCommunityList.get(0); + + @Override + public void onNext(List communityBeans) { + if (null != mProgressDialog && mProgressDialog.isShowing()) { + mProgressDialog.dismiss(); + } + if (null != communityBeans && communityBeans.size() > 0) { + if (i == 0) { + //第一次 + if (mUserDepartmentBean != null && !TextUtils.isEmpty(mUserDepartmentBean.getCommunityIds())) { + for (int j = 0; j < communityBeans.size(); j++) { + if (mUserDepartmentBean.getCommunityIds().contains(communityBeans.get(j).getCommunityId())) { + LogUtils.e("=社区匹配到了="); + mCommunityList = communityBeans; + mTvCommContent.setText(communityBeans.get(j).getCommunityName()); + mSelectCommBean = mCommunityList.get(j); + break; + } else { + mCommunityList = communityBeans; + mTvCommContent.setText(communityBeans.get(0).getCommunityName()); + mSelectCommBean = mCommunityList.get(0); + } + } + } else { + mCommunityList = communityBeans; + mTvCommContent.setText(communityBeans.get(0).getCommunityName()); + mSelectCommBean = mCommunityList.get(0); + if (mCommunityPicker != null) { + mCommunityPicker.setPicker(mCommunityList); } } } else { @@ -830,34 +839,26 @@ public class IssueReportActivity extends BaseActivity { } } } else { - mCommunityList = communityBeans; - mTvCommContent.setText(communityBeans.get(0).getCommunityName()); - mSelectCommBean = mCommunityList.get(0); - if (mCommunityPicker != null) { - mCommunityPicker.setPicker(mCommunityList); - } + mTvCommContent.setText(""); + mTvCommContent.setHint("请选择社区"); + mSelectCommBean = null; + mCommunityList = null; + ToastUtils.showShort("当前区域暂无社区"); } - } else { - mTvCommContent.setText(""); - mTvCommContent.setHint("请选择社区"); - mSelectCommBean = null; - mCommunityList = null; - ToastUtils.showShort("当前区域暂无社区"); } - } - @Override - public void onError(Throwable e) { - if (null != mProgressDialog && mProgressDialog.isShowing()) { - mProgressDialog.dismiss(); + @Override + public void onError(Throwable e) { + if (null != mProgressDialog && mProgressDialog.isShowing()) { + mProgressDialog.dismiss(); + } } - } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private void onShowCommunityPicker() { @@ -870,11 +871,11 @@ public class IssueReportActivity extends BaseActivity { mTvCommContent.setText(mCommunityList.get(options1).getCommunityName()); mSelectCommBean = mCommunityList.get(options1); }) - .setTitleText("请选择社区") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择社区") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mCommunityPicker.setPicker(mCommunityList); } mCommunityPicker.show(); @@ -889,11 +890,11 @@ public class IssueReportActivity extends BaseActivity { private void showSelectPhoto(AddPhotoBean bean) { hideSoftKeyboard(); ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity) - .setIsBackCancelable(true) - .setIscancelable(true) - .setShowLocation(Gravity.BOTTOM) - .setIsShowFile(false) - .build(); + .setIsBackCancelable(true) + .setIscancelable(true) + .setShowLocation(Gravity.BOTTOM) + .setIsShowFile(false) + .build(); buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() { @Override public void choseFile() { @@ -904,7 +905,7 @@ public class IssueReportActivity extends BaseActivity { mCurrentBean = bean; Intent intent = new Intent(Intent.ACTION_PICK, null); intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - "image/*"); + "image/*"); startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST); buttomDialogView.dismiss(); } @@ -985,10 +986,10 @@ public class IssueReportActivity extends BaseActivity { ContentResolver cr = mActivity.getContentResolver(); StringBuffer buff = new StringBuffer(); buff.append("(").append(MediaStore.Images.ImageColumns.DATA).append("=") - .append("'" + path + "'").append(")"); + .append("'" + path + "'").append(")"); Cursor cur = cr.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - new String[]{MediaStore.Images.ImageColumns._ID}, - buff.toString(), null, null); + new String[]{MediaStore.Images.ImageColumns._ID}, + buff.toString(), null, null); int index = 0; for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) { index = cur.getColumnIndex(MediaStore.Images.ImageColumns._ID); @@ -1022,74 +1023,74 @@ public class IssueReportActivity extends BaseActivity { progressDialog.show(); String pathStr = getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + PathConfig.CATCH_PATH; Luban.with(mActivity) - .load(picPath) - .ignoreBy(100) - .setTargetDir(pathStr) - .filter(path -> !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif"))) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { + .load(picPath) + .ignoreBy(100) + .setTargetDir(pathStr) + .filter(path -> !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif"))) + .setCompressListener(new OnCompressListener() { + @Override + public void onStart() { - } - - @Override - public void onSuccess(File file) { - RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); - MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); - RetrofitManager.getInstance() - .create(LocationApiService.class) - .uploadImage(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onNext(BaseUserBean baseUserBean) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); - } - ToastUtils.showShort("上传成功"); - mPhotoIds += (baseUserBean.getData() + ","); - mCurrentBean.setId(baseUserBean.getData()); - mCurrentBean.setPath(picPath); - if (mPhotos.size() < 4) { - mPhotos.add(new AddPhotoBean()); - } - mPhotoAdapter.notifyDataSetChanged(); - mCurrentBean = null; - } - - @Override - public void onError(Throwable e) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); - } - ToastUtils.showShort("上传失败,请稍后重试."); - if (file.exists()) { - file.delete(); - } - } - - @Override - public void onComplete() { - - } - }); - } - - @Override - public void onError(Throwable e) { - if (progressDialog.isShowing()) { - progressDialog.dismiss(); } - ToastUtils.showShort("图片上传失败,请稍后重试"); - } - }) - .launch(); + + @Override + public void onSuccess(File file) { + RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); + MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .uploadImage(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseUserBean baseUserBean) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传成功"); + mPhotoIds += (baseUserBean.getData() + ","); + mCurrentBean.setId(baseUserBean.getData()); + mCurrentBean.setPath(picPath); + if (mPhotos.size() < 4) { + mPhotos.add(new AddPhotoBean()); + } + mPhotoAdapter.notifyDataSetChanged(); + mCurrentBean = null; + } + + @Override + public void onError(Throwable e) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传失败,请稍后重试."); + if (file.exists()) { + file.delete(); + } + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + public void onError(Throwable e) { + if (progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("图片上传失败,请稍后重试"); + } + }) + .launch(); } @Override diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/beans/IssueDetailBean.java b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/IssueDetailBean.java new file mode 100644 index 0000000..1f88c7d --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/beans/IssueDetailBean.java @@ -0,0 +1,302 @@ +package com.sucstepsoft.realtimelocation.beans; + +public class IssueDetailBean { + + private String areaId; + private String areaName; + private String caseAudio; + private String caseContent; + private String caseFlowForward; + private String caseFlowType; + private String caseLatitude; + private String caseLongitude; + private String caseNumber; + private String casePhotos; + private String casePosition; + private String caseReporter; + private String caseSource; + private String caseStatus; + private String caseTypeId; + private String caseTypeName; + private String communityId; + private String communityName; + private String gmtModified; + private String grade; + private String handleCreateTime; + private String handleOpinion; + private String handlePhotos; + private String handleUserCommunityName; + private String handleUserDepartmentName; + private String handleUserName; + private String handleUserUsername; + private int isAccept; + private int isDeny; + private int isSelf; + private String readTime; + private String reportCaseId; + private String reportDate; + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public String getCaseAudio() { + return caseAudio; + } + + public void setCaseAudio(String caseAudio) { + this.caseAudio = caseAudio; + } + + public String getCaseContent() { + return caseContent; + } + + public void setCaseContent(String caseContent) { + this.caseContent = caseContent; + } + + public String getCaseFlowForward() { + return caseFlowForward; + } + + public void setCaseFlowForward(String caseFlowForward) { + this.caseFlowForward = caseFlowForward; + } + + public String getCaseFlowType() { + return caseFlowType; + } + + public void setCaseFlowType(String caseFlowType) { + this.caseFlowType = caseFlowType; + } + + public String getCaseLatitude() { + return caseLatitude; + } + + public void setCaseLatitude(String caseLatitude) { + this.caseLatitude = caseLatitude; + } + + public String getCaseLongitude() { + return caseLongitude; + } + + public void setCaseLongitude(String caseLongitude) { + this.caseLongitude = caseLongitude; + } + + public String getCaseNumber() { + return caseNumber; + } + + public void setCaseNumber(String caseNumber) { + this.caseNumber = caseNumber; + } + + public String getCasePhotos() { + return casePhotos; + } + + public void setCasePhotos(String casePhotos) { + this.casePhotos = casePhotos; + } + + public String getCasePosition() { + return casePosition; + } + + public void setCasePosition(String casePosition) { + this.casePosition = casePosition; + } + + public String getCaseReporter() { + return caseReporter; + } + + public void setCaseReporter(String caseReporter) { + this.caseReporter = caseReporter; + } + + public String getCaseSource() { + return caseSource; + } + + public void setCaseSource(String caseSource) { + this.caseSource = caseSource; + } + + public String getCaseStatus() { + return caseStatus; + } + + public void setCaseStatus(String caseStatus) { + this.caseStatus = caseStatus; + } + + public String getCaseTypeId() { + return caseTypeId; + } + + public void setCaseTypeId(String caseTypeId) { + this.caseTypeId = caseTypeId; + } + + public String getCaseTypeName() { + return caseTypeName; + } + + public void setCaseTypeName(String caseTypeName) { + this.caseTypeName = caseTypeName; + } + + public String getCommunityId() { + return communityId; + } + + public void setCommunityId(String communityId) { + this.communityId = communityId; + } + + public String getCommunityName() { + return communityName; + } + + public void setCommunityName(String communityName) { + this.communityName = communityName; + } + + public String getGmtModified() { + return gmtModified; + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getHandleCreateTime() { + return handleCreateTime; + } + + public void setHandleCreateTime(String handleCreateTime) { + this.handleCreateTime = handleCreateTime; + } + + public String getHandleOpinion() { + return handleOpinion; + } + + public void setHandleOpinion(String handleOpinion) { + this.handleOpinion = handleOpinion; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getHandleUserCommunityName() { + return handleUserCommunityName; + } + + public void setHandleUserCommunityName(String handleUserCommunityName) { + this.handleUserCommunityName = handleUserCommunityName; + } + + public String getHandleUserDepartmentName() { + return handleUserDepartmentName; + } + + public void setHandleUserDepartmentName(String handleUserDepartmentName) { + this.handleUserDepartmentName = handleUserDepartmentName; + } + + public String getHandleUserName() { + return handleUserName; + } + + public void setHandleUserName(String handleUserName) { + this.handleUserName = handleUserName; + } + + public String getHandleUserUsername() { + return handleUserUsername; + } + + public void setHandleUserUsername(String handleUserUsername) { + this.handleUserUsername = handleUserUsername; + } + + public int getIsAccept() { + return isAccept; + } + + public void setIsAccept(int isAccept) { + this.isAccept = isAccept; + } + + public int getIsDeny() { + return isDeny; + } + + public void setIsDeny(int isDeny) { + this.isDeny = isDeny; + } + + public int getIsSelf() { + return isSelf; + } + + public void setIsSelf(int isSelf) { + this.isSelf = isSelf; + } + + public String getReadTime() { + return readTime; + } + + public void setReadTime(String readTime) { + this.readTime = readTime; + } + + public String getReportCaseId() { + return reportCaseId; + } + + public void setReportCaseId(String reportCaseId) { + this.reportCaseId = reportCaseId; + } + + public String getReportDate() { + return reportDate; + } + + public void setReportDate(String reportDate) { + this.reportDate = reportDate; + } +} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/MineIssueFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/MineIssueFragment.java index 4b06f8b..c916995 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/MineIssueFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/MineIssueFragment.java @@ -102,6 +102,7 @@ public class MineIssueFragment extends LazyFragment { */ private void showIssueDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("bean", bean); startActivity(intent); } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/PendingFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/PendingFragment.java index 3072404..3a43d5a 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/PendingFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/PendingFragment.java @@ -122,6 +122,7 @@ public class PendingFragment extends LazyFragment { */ private void showIssueDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("bean", bean); switch (bean.getCaseStatus()) { case "0"://待受理 diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/SpecialCaseDisFragment.java b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/SpecialCaseDisFragment.java index 4d1ee67..1752d4c 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/SpecialCaseDisFragment.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/SpecialCaseDisFragment.java @@ -106,6 +106,7 @@ public class SpecialCaseDisFragment extends LazyFragment { */ private void showIssueDetail(IssueSubBean.RowsBean bean) { Intent intent = new Intent(mActivity, IssueDetailActivity.class); + intent.putExtra("id",bean.getReportCaseId()); intent.putExtra("bean", bean); switch (bean.getCaseStatus()) { case "0"://待受理 diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java index 389a07c..0453af6 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java @@ -22,6 +22,7 @@ import com.sucstepsoft.realtimelocation.beans.HireHouseDetailBean; import com.sucstepsoft.realtimelocation.beans.HouseLivePersonBean; import com.sucstepsoft.realtimelocation.beans.HousePersonBean; import com.sucstepsoft.realtimelocation.beans.HousePersonListBean; +import com.sucstepsoft.realtimelocation.beans.IssueDetailBean; import com.sucstepsoft.realtimelocation.beans.IssueSubBean; import com.sucstepsoft.realtimelocation.beans.LeaveDetailBean; import com.sucstepsoft.realtimelocation.beans.LeaveListBean; @@ -455,7 +456,7 @@ public interface LocationApiService { @Headers({"base_url_name:dict"}) @GET("app/reportcase/getreportcase/{reportCaseId}") - Observable getIssueDetail(@Path("reportCaseId") String id, @Header("token") String token); + Observable getIssueDetail(@Path("reportCaseId") String id, @Header("token") String token); //GET /app/reportcase/getreportcase/{reportCaseId} diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java b/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java index 607544c..8600ee1 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java @@ -80,9 +80,8 @@ public class ExpandableLinearLayout extends LinearLayout implements View.OnClick */ private void findViews() { bottomView = View.inflate(getContext(), R.layout.item_ell_bottom, null); - ivArrow = (ImageView) bottomView.findViewById(R.id.iv_arrow); - - tvTip = (TextView) bottomView.findViewById(R.id.tv_tip); + ivArrow = bottomView.findViewById(R.id.iv_arrow); + tvTip = bottomView.findViewById(R.id.tv_tip); tvTip.getPaint().setTextSize(fontSize); tvTip.setTextColor(textColor); ivArrow.setImageResource(arrowResId); diff --git a/app/src/main/res/drawable-xhdpi/ic_issue_state_title_icon.png b/app/src/main/res/drawable-xhdpi/ic_issue_state_title_icon.png new file mode 100644 index 0000000..60d011e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_issue_state_title_icon.png differ diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml index e0048d1..71c2f6c 100755 --- a/app/src/main/res/layout/activity_issue_detail.xml +++ b/app/src/main/res/layout/activity_issue_detail.xml @@ -1,5 +1,5 @@ - - + android:layout_height="100dp" + android:background="@color/titleBar" + android:orientation="horizontal" + android:padding="25dp"> + + + + + + + + - - - - - - - - - - - - - - - - + android:orientation="vertical"> + - - - - - - - - - + android:background="@drawable/shape_rectangle_white" + android:orientation="vertical" + android:padding="10dp" + tools:visibility="visible"> + android:layout_weight="1" + android:textColor="@color/black" + android:textSize="16dp" + tools:text="稀土路街道办事处" /> + android:id="@+id/tv_up_time" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="right" + android:textColor="@color/text_80_gray" + android:textSize="12dp" + tools:text="2022-10-16 12:12:12" /> + + + + + + + + + + + + + + + + + + + + + + + - - + android:layout_height="wrap_content" + android:layout_marginTop="5dp" /> - - - - - - - - + android:layout_height="wrap_content"> - - + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + app:cardCornerRadius="5dp"> -