diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index e3c6a54..8287387 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -186,21 +185,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index e3c6a54..8287387 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -186,21 +185,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index c77c3cf..b3e36d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -44,7 +42,6 @@ import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -261,21 +258,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -287,16 +270,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -324,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -349,30 +328,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index e3c6a54..8287387 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -186,21 +185,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index c77c3cf..b3e36d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -44,7 +42,6 @@ import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -261,21 +258,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -287,16 +270,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -324,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -349,30 +328,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 55898a4..60ba558 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -28,8 +28,6 @@ import com.casic.dcms.mvp.view.IPublicToiletView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -52,7 +50,6 @@ import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -305,14 +302,7 @@ }); break; case R.id.takePictureView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); + OtherUtils.takePicture(this); break; case R.id.signInButton: LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index e3c6a54..8287387 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -186,21 +185,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index c77c3cf..b3e36d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -44,7 +42,6 @@ import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -261,21 +258,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -287,16 +270,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -324,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -349,30 +328,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 55898a4..60ba558 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -28,8 +28,6 @@ import com.casic.dcms.mvp.view.IPublicToiletView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -52,7 +50,6 @@ import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -305,14 +302,7 @@ }); break; case R.id.takePictureView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); + OtherUtils.takePicture(this); break; case R.id.signInButton: LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index c60c7cb..5d95ad1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -1,10 +1,8 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.text.TextUtils; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -179,19 +177,7 @@ WellListBean.DataBean.RowsBean rowsBean = activity.dataBeans.get(position); String lng = rowsBean.getCoordinateX(); String lat = rowsBean.getCoordinateY(); - Intent intent = new Intent(activity, DisplayMapActivity.class); - intent.putExtra("caseType", "others"); - if (TextUtils.isEmpty(lng)) { - ToastHelper.showToast("经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(lng)); - if (TextUtils.isEmpty(lat)) { - ToastHelper.showToast("纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(lat)); - activity.startActivity(intent); + OtherUtils.displayOnMap(activity, "others", lng, lat); } }); activity.adapter.setOnOptionClickListener(new WellListAdapter.OnOptionClickListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 320d7cb..8ae7a48 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -24,15 +24,13 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -41,7 +39,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -157,21 +154,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -179,16 +162,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseCheckDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseCheckDetailActivity.this); } }) .create().show(); @@ -222,30 +203,6 @@ changeState, remarks, StringHelper.reformatURL(mediaList)); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 241e778..959400e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -102,21 +101,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d58d491..01edc50 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -220,21 +219,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleRecordLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 84e1c73..31495be 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -26,8 +26,8 @@ import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -45,7 +43,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -258,21 +255,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -283,16 +266,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseHandleDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseHandleDetailActivity.this); } }) .create().show(); @@ -329,30 +310,6 @@ changeState, caseReason, StringHelper.reformatURL(mediaList), approvalResult); } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 26bcf4b..b626ee4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -190,21 +189,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 682e948..3a047da 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -18,11 +17,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.mvp.view.ICommonSentenceView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -109,21 +108,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 8d7ab49..5f4c1a2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -166,21 +165,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 2975f92..91bf9f9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -54,7 +53,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -122,7 +120,7 @@ private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 @@ -281,15 +279,7 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addVideoView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofVideo()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .recordVideoSecond(15) - .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + OtherUtils.takeVideo(this); break; case R.id.deleteView: if (videoPlayerView.isShown()) { @@ -315,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadActivity.this); } }) .create().show(); @@ -337,30 +325,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 3e16a69..03b5ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -127,16 +124,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadPackageActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadPackageActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -148,30 +143,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index c247950..964490e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -29,15 +29,12 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -205,16 +202,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseUploadQuicklyActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseUploadQuicklyActivity.this); } }) .create().show(); @@ -238,30 +233,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index af34e8f..7ead240 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -163,21 +162,7 @@ @Override public void onClick(View v) { if (v.getId() == R.id.locationMapView) { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index d55539b..c3b3b66 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -30,8 +30,8 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseDetailHandleView; +import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -39,8 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -49,7 +47,6 @@ import com.casic.dcms.widgets.AudioPlayerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -344,21 +341,7 @@ intent.putExtra("type", type); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); } break; case R.id.addImageView: @@ -367,16 +350,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(CaseVerifyDetailActivity.this); } }) .create().show(); @@ -486,30 +467,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6f18c57..6895c2f 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -23,15 +23,12 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -120,16 +117,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(ChangeShopInfoActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(ChangeShopInfoActivity.this); } }) .setCanceledOnTouchOutside(false) @@ -168,30 +163,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index b11a51a..0b4b82a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -124,21 +123,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 030843e..52b3df3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -137,21 +136,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index e4df2b6..f22a99d 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -254,21 +253,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseOptTypeLayout: if (nodeDataBeans != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index e3c6a54..8287387 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -186,21 +185,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.handleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index c77c3cf..b3e36d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -35,8 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -44,7 +42,6 @@ import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.tools.PictureFileUtils; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -261,21 +258,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.locationMapView: - Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("caseType", data.getEorcName()); - String dataLng = data.getLng(); - if (TextUtils.isEmpty(dataLng)) { - ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = data.getLat(); - if (TextUtils.isEmpty(dataLat)) { - ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + OtherUtils.displayOnMap(this, data.getEorcName(), data.getLng(), data.getLat()); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -287,16 +270,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -324,16 +305,14 @@ @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //选图 - selectPicture(); + OtherUtils.selectPicture(PackageTodoDetailActivity.this); } }) .addItem("相机拍照", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - //拍照 - takePicture(); + OtherUtils.takePicture(PackageTodoDetailActivity.this); } }) .create().show(); @@ -349,30 +328,6 @@ } } - private void selectPicture() { - PictureSelector.create(this) - .openGallery(PictureMimeType.ofImage()) - .isWeChatStyle(true) - .isCamera(false) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(2) - .forResult(PictureConfig.CHOOSE_REQUEST); - } - - private void takePicture() { - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 55898a4..60ba558 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -28,8 +28,6 @@ import com.casic.dcms.mvp.view.IPublicToiletView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -52,7 +50,6 @@ import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.entity.LocalMedia; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; @@ -305,14 +302,7 @@ }); break; case R.id.takePictureView: - PictureSelector.create(this) - .openCamera(PictureMimeType.ofImage()) - .isCompress(true) - .compressQuality(90) - .compressSavePath(FileUtils.getImageCompressPath()) - .imageEngine(GlideLoadEngine.createGlideEngine()) - .maxSelectNum(1) - .forResult(PictureConfig.REQUEST_CAMERA); + OtherUtils.takePicture(this); break; case R.id.signInButton: LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index c60c7cb..5d95ad1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -1,10 +1,8 @@ package com.casic.dcms.ui; import android.content.Context; -import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.text.TextUtils; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -179,19 +177,7 @@ WellListBean.DataBean.RowsBean rowsBean = activity.dataBeans.get(position); String lng = rowsBean.getCoordinateX(); String lat = rowsBean.getCoordinateY(); - Intent intent = new Intent(activity, DisplayMapActivity.class); - intent.putExtra("caseType", "others"); - if (TextUtils.isEmpty(lng)) { - ToastHelper.showToast("经度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lng", Double.parseDouble(lng)); - if (TextUtils.isEmpty(lat)) { - ToastHelper.showToast("纬度异常", ToastHelper.ERROR); - return; - } - intent.putExtra("lat", Double.parseDouble(lat)); - activity.startActivity(intent); + OtherUtils.displayOnMap(activity, "others", lng, lat); } }); activity.adapter.setOnOptionClickListener(new WellListAdapter.OnOptionClickListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 54c3262..a85e1ef 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -2,6 +2,7 @@ import android.Manifest; import android.annotation.SuppressLint; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -14,6 +15,10 @@ import com.casic.dcms.ui.BigImageActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.ui.DisplayMapActivity; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.config.PictureMimeType; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import java.lang.reflect.Method; @@ -23,6 +28,87 @@ private static final String TAG = "OtherUtils"; private static QMUITipDialog loadingDialog; + //选图 + public static void selectPicture(Activity activity) { + if (activity == null) { + return; + } + PictureSelector.create(activity) + .openGallery(PictureMimeType.ofImage()) + .isWeChatStyle(true) + .isCamera(false) + .isCompress(true) + .compressQuality(90) + .compressSavePath(FileUtils.getImageCompressPath()) + .imageEngine(GlideLoadEngine.createGlideEngine()) + .maxSelectNum(2) + .forResult(PictureConfig.CHOOSE_REQUEST); + } + + //拍照 + public static void takePicture(Activity activity) { + if (activity == null) { + return; + } + PictureSelector.create(activity) + .openCamera(PictureMimeType.ofImage()) + .isCompress(true) + .compressQuality(90) + .compressSavePath(FileUtils.getImageCompressPath()) + .imageEngine(GlideLoadEngine.createGlideEngine()) + .maxSelectNum(1) + .forResult(PictureConfig.REQUEST_CAMERA); + } + + //拍照 + public static void takeVideo(Activity activity) { + if (activity == null) { + return; + } + PictureSelector.create(activity) + .openCamera(PictureMimeType.ofVideo()) + .isCompress(true) + .compressQuality(90) + .compressSavePath(FileUtils.getImageCompressPath()) + .imageEngine(GlideLoadEngine.createGlideEngine()) + .maxSelectNum(1) + .recordVideoSecond(15) + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); + } + + public static void showLoadingDialog(Context context, String message) { + loadingDialog = new QMUITipDialog.Builder(context) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create(); + loadingDialog.show(); + } + + public static void dismissLoadingDialog() { + if (loadingDialog != null) { + if (loadingDialog.isShowing()) { + loadingDialog.dismiss(); + } + } + } + + //查看地图位置 + public static void displayOnMap(Context context, String eorc, String lng, String lat) { + Intent intent = new Intent(context, DisplayMapActivity.class); + intent.putExtra("caseType", eorc); + if (TextUtils.isEmpty(lng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(lng)); + if (TextUtils.isEmpty(lat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(lat)); + context.startActivity(intent); + } + //查看大图 public static void showBigImage(Context context, int index, ArrayList imageList) { Intent intent = new Intent(context, BigImageActivity.class); @@ -69,18 +155,4 @@ } return ""; } - - public static void showLoadingDialog(Context context, String message) { - loadingDialog = new QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create(); - loadingDialog.show(); - } - - public static void dismissLoadingDialog() { - if (loadingDialog != null || loadingDialog.isShowing()) { - loadingDialog.dismiss(); - } - } }