From 23849d290336e24879b7f6c5e765977fdf394d41 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Sun, 12 Mar 2023 12:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=A1=88=E4=BB=B6=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=9B=B8=E7=89=87=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 + .../activitys/issue/IssueDetailActivity.java | 437 +++++++++--------- .../core/retrofit_net/BaseUrlApi.java | 8 +- 3 files changed, 231 insertions(+), 222 deletions(-) diff --git a/README.md b/README.md index 4887fd8..6dfb292 100755 --- a/README.md +++ b/README.md @@ -39,4 +39,12 @@ 1.境外人员 字段变更 +``` + +## 2023-3-12 +``` +> 1.4.6 + +1.去除案件检查时相片必填选项 + ``` \ No newline at end of file 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 9e01e2d..44fe641 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 @@ -8,7 +8,6 @@ import android.graphics.drawable.AnimationDrawable; import android.net.Uri; import android.os.Build; import android.os.Environment; -import android.print.PrintManager; import android.provider.MediaStore; import android.support.v4.content.FileProvider; import android.support.v7.widget.GridLayoutManager; @@ -199,31 +198,31 @@ public class IssueDetailActivity extends BaseActivity { 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) { + .create(LocationApiService.class) + .getIssueDetail(rowsBean.getReportCaseId(), 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(Object o) { - } + } - @Override - public void onError(Throwable e) { + @Override + public void onError(Throwable e) { - } + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -328,39 +327,39 @@ public class IssueDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "上报中..."); dialog.show(); RetrofitManager.getInstance() - .create(LocationApiService.class) - .returnIssueDis(mRowsBean.getReportCaseId(), UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .returnIssueDis(mRowsBean.getReportCaseId(), UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } - - @Override - public void onNext(SuccessBean successBean) { - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); } - ToastUtils.showShort("回退成功"); - finish(); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); + @Override + public void onNext(SuccessBean successBean) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("回退成功"); + finish(); } - ToastUtils.showShort("回退失败,请稍后重试"); - } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + e.printStackTrace(); + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("回退失败,请稍后重试"); + } - } - }); + @Override + public void onComplete() { + + } + }); } private void doDisportIssue() { @@ -385,39 +384,39 @@ public class IssueDetailActivity extends BaseActivity { String obj = gson.toJson(issueDisBean); RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() - .create(LocationApiService.class) - .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } - - @Override - public void onNext(SuccessBean successBean) { - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); } - ToastUtils.showShort("处理成功"); - finish(); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); + @Override + public void onNext(SuccessBean successBean) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("处理成功"); + finish(); } - ToastUtils.showShort("处理失败,请稍后重试"); - } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + e.printStackTrace(); + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("处理失败,请稍后重试"); + } - } - }); + @Override + public void onComplete() { + + } + }); } } @@ -427,9 +426,11 @@ public class IssueDetailActivity extends BaseActivity { String desc = mEtIssueDisDesc.getText().toString().trim(); //处理 String ids = ""; - for (int i = 0; i < mPhotoAdapter.getData().size(); i++) { - if (!TextUtils.isEmpty(mPhotoAdapter.getData().get(i).getId())) { - ids += mPhotoAdapter.getData().get(i).getId() + ","; + if (mPhotoAdapter.getData() != null && mPhotoAdapter.getData().size() >= 2) { + for (int i = 0; i < mPhotoAdapter.getData().size(); i++) { + if (!TextUtils.isEmpty(mPhotoAdapter.getData().get(i).getId())) { + ids += mPhotoAdapter.getData().get(i).getId() + ","; + } } } bean.setInspectPhotos(ids); @@ -449,10 +450,10 @@ public class IssueDetailActivity extends BaseActivity { * @return */ private boolean checkInspectParams() { - if (mPhotoAdapter.getData() == null || mPhotoAdapter.getData().size() <= 1) { - ToastUtils.showShort("请上传现场照片."); - return false; - } +// if (mPhotoAdapter.getData() == null || mPhotoAdapter.getData().size() <= 1) { +// ToastUtils.showShort("请上传现场照片."); +// return false; +// } String desc = mEtIssueDisDesc.getText().toString().trim(); if (TextUtils.isEmpty(desc)) { ToastUtils.showShort("请输入检查描述内容."); @@ -472,21 +473,28 @@ public class IssueDetailActivity extends BaseActivity { String obj = gson.toJson(issueDisBean); RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() - .create(LocationApiService.class) - .saveIssueDis(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .saveIssueDis(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(SuccessBean successBean) { - if (isSelf) { - if (isAccept) { - doCheckSelf(dialog); + @Override + public void onNext(SuccessBean successBean) { + if (isSelf) { + if (isAccept) { + doCheckSelf(dialog); + } else { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("处理成功"); + finish(); + } } else { if (dialog != null && dialog.isShowing()) { dialog.dismiss(); @@ -494,30 +502,23 @@ public class IssueDetailActivity extends BaseActivity { ToastUtils.showShort("处理成功"); finish(); } - } else { + + } + + @Override + public void onError(Throwable e) { + e.printStackTrace(); if (dialog != null && dialog.isShowing()) { dialog.dismiss(); } - ToastUtils.showShort("处理成功"); - finish(); + ToastUtils.showShort("处理失败,请稍后重试."); } - } + @Override + public void onComplete() { - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); } - ToastUtils.showShort("处理失败,请稍后重试."); - } - - @Override - public void onComplete() { - - } - }); + }); } private IssueDisBean buildParasm() { @@ -590,39 +591,39 @@ public class IssueDetailActivity extends BaseActivity { String obj = gson.toJson(issueDisBean); RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() - .create(LocationApiService.class) - .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(LocationApiService.class) + .saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } - - @Override - public void onNext(SuccessBean successBean) { - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); } - ToastUtils.showShort("处理成功"); - finish(); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); + @Override + public void onNext(SuccessBean successBean) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("处理成功"); + finish(); } - ToastUtils.showShort("处理失败,请稍后重试"); - } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + e.printStackTrace(); + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + ToastUtils.showShort("处理失败,请稍后重试"); + } - } - }); + @Override + public void onComplete() { + + } + }); } private void setDetailDataToView() { @@ -738,10 +739,10 @@ public class IssueDetailActivity extends BaseActivity { MapStatus ms = new MapStatus.Builder().zoom(14).target(new LatLng(a, l)).build(); map.animateMapStatus(MapStatusUpdateFactory.newMapStatus(ms)); MarkerOptions markerOptions = new MarkerOptions() - .position(new LatLng(a, l))//mark出现的位置 - .icon(mapIcon) //mark图标 - .draggable(false)//mark可拖拽 - .animateType(MarkerOptions.MarkerAnimateType.none); + .position(new LatLng(a, l))//mark出现的位置 + .icon(mapIcon) //mark图标 + .draggable(false)//mark可拖拽 + .animateType(MarkerOptions.MarkerAnimateType.none); map.addOverlay(markerOptions); mBtnReload.setOnClickListener(v -> map.animateMapStatus(MapStatusUpdateFactory.newMapStatus(ms))); } @@ -815,11 +816,11 @@ public class IssueDetailActivity extends BaseActivity { AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); animationDrawable.start(); MediaManager.playSound(BaseUrlApi.BASE_IMG_URL + caseAudio, - mp -> { - animationDrawable.selectDrawable(0);//显示动画第一帧 - animationDrawable.stop(); - MediaManager.destroy(); - }); + mp -> { + animationDrawable.selectDrawable(0);//显示动画第一帧 + animationDrawable.stop(); + MediaManager.destroy(); + }); } /** @@ -829,11 +830,11 @@ public class IssueDetailActivity extends BaseActivity { */ private void showSelectPhoto(AddPhotoBean bean) { 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() { @@ -844,7 +845,7 @@ public class IssueDetailActivity 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(); } @@ -924,74 +925,74 @@ public class IssueDetailActivity 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/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 23579bf..63f4805 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -9,8 +9,8 @@ import com.sucstepsoft.cm_utils.constant.PathConfig; */ public class BaseUrlApi { -// public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ - public static final String IP = "http://192.168.31.14:7001/usercenter/"; /*测试统一用户*/ + public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ +// public static final String IP = "http://192.168.31.14:7001/usercenter/"; /*测试统一用户*/ // public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/ public static final String BASE_URL = IP; public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion"; @@ -18,9 +18,9 @@ public class BaseUrlApi { public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan"; public static final int PHOTO_REQUEST = 233; public static final int CAMERA_REQUEST = 123; -// public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ + public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ // public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/ - public static final String BASE_IP_P = "http://192.168.31.14:8083/"; /*测试IP*/ +// public static final String BASE_IP_P = "http://192.168.31.14:8083/"; /*测试IP*/ 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/";/*人口系统*/