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 6fe26b0..597c744 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,9 +120,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private String eorc; - private String typeCode; - private String typeDetailCode; + private String eorc = "请选择"; + private String typeCode = "请选择"; + private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -229,15 +229,15 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); - caseLargeClassView.setText(tag); caseLargeClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); + caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); } }).build().show(); @@ -256,10 +256,10 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - caseSmallClassView.setText(tag); caseSmallClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + + typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -582,13 +582,24 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - - String fieldIntro = caseLocationView.getText().toString(); + if (eorc.equals("请选择") || typeCode.equals("请选择")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("请选择")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; 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 6fe26b0..597c744 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,9 +120,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private String eorc; - private String typeCode; - private String typeDetailCode; + private String eorc = "请选择"; + private String typeCode = "请选择"; + private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -229,15 +229,15 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); - caseLargeClassView.setText(tag); caseLargeClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); + caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); } }).build().show(); @@ -256,10 +256,10 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - caseSmallClassView.setText(tag); caseSmallClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + + typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -582,13 +582,24 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - - String fieldIntro = caseLocationView.getText().toString(); + if (eorc.equals("请选择") || typeCode.equals("请选择")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("请选择")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; 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 3b61f0d..09bb91f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc; - private String typeCode; - private String typeDetailCode; + private String eorc = "请选择"; + private String typeCode = "请选择"; + private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -164,16 +164,15 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - - typeCode = largeClassBeans.get(position).getTypeCode(); - caseLargeClassView.setText(tag); caseLargeClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); + caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); } }).build().show(); @@ -192,11 +191,10 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - caseSmallClassView.setText(tag); caseSmallClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + + typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -394,13 +392,24 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - - String fieldIntro = caseLocationView.getText().toString(); + if (eorc.equals("请选择") || typeCode.equals("请选择")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("请选择")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; 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 6fe26b0..597c744 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,9 +120,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private String eorc; - private String typeCode; - private String typeDetailCode; + private String eorc = "请选择"; + private String typeCode = "请选择"; + private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -229,15 +229,15 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); - caseLargeClassView.setText(tag); caseLargeClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); + caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); } }).build().show(); @@ -256,10 +256,10 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - caseSmallClassView.setText(tag); caseSmallClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + + typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -582,13 +582,24 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - - String fieldIntro = caseLocationView.getText().toString(); + if (eorc.equals("请选择") || typeCode.equals("请选择")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("请选择")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; 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 3b61f0d..09bb91f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc; - private String typeCode; - private String typeDetailCode; + private String eorc = "请选择"; + private String typeCode = "请选择"; + private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -164,16 +164,15 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - - typeCode = largeClassBeans.get(position).getTypeCode(); - caseLargeClassView.setText(tag); caseLargeClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); + caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); } }).build().show(); @@ -192,11 +191,10 @@ @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - caseSmallClassView.setText(tag); caseSmallClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + + typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -394,13 +392,24 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - - String fieldIntro = caseLocationView.getText().toString(); + if (eorc.equals("请选择") || typeCode.equals("请选择")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("请选择")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index e044cd7..10cb371 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -214,23 +214,23 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - String shopKeeper = shopKeeperView.getText().toString(); + String shopKeeper = shopKeeperView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(shopKeeper)) { ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - String phoneNumber = phoneNumberView.getText().toString(); + String phoneNumber = phoneNumberView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(phoneNumber)) { ToastHelper.showToast("电话号码还未填写", ToastHelper.WARING); return; } if (StringHelper.isPhoneNumber(phoneNumber)) { - String fieldIntro = caseLocationView.getText().toString(); + String fieldIntro = caseLocationView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); return; } - String description = caseDetailEditView.getText().toString(); + String description = caseDetailEditView.getText().toString().trim().replace(" ", ""); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return;