diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 34e9e46..bf56610 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -56,8 +56,8 @@ private CaseViewModel caseViewModel; private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; - private List largeTypeBeans; - private List smallTypeBeans; + private List largeTypeBeans = new ArrayList<>(); + private List smallTypeBeans = new ArrayList<>(); private EditableImageAdapter imageAdapter; private String eorc = ""; private String typeCode = ""; @@ -135,9 +135,6 @@ @Override public void initData() { - largeTypeBeans = new ArrayList<>(); - smallTypeBeans = new ArrayList<>(); - weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); @@ -234,6 +231,8 @@ commonDataViewModel.obtainSmallType(eorc, typeId); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷类型"); } } }); @@ -260,6 +259,8 @@ typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷大类"); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 34e9e46..bf56610 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -56,8 +56,8 @@ private CaseViewModel caseViewModel; private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; - private List largeTypeBeans; - private List smallTypeBeans; + private List largeTypeBeans = new ArrayList<>(); + private List smallTypeBeans = new ArrayList<>(); private EditableImageAdapter imageAdapter; private String eorc = ""; private String typeCode = ""; @@ -135,9 +135,6 @@ @Override public void initData() { - largeTypeBeans = new ArrayList<>(); - smallTypeBeans = new ArrayList<>(); - weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); @@ -234,6 +231,8 @@ commonDataViewModel.obtainSmallType(eorc, typeId); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷类型"); } } }); @@ -260,6 +259,8 @@ typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷大类"); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index df3a56e..2a8f272 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -86,8 +86,8 @@ private CaseViewModel caseViewModel; private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; - private List largeTypeBeans; - private List smallTypeBeans; + private List largeTypeBeans = new ArrayList<>(); + private List smallTypeBeans = new ArrayList<>(); private ProgressDialog progressDialog; private EditableImageAdapter imageAdapter; private AudioRecodeHelper audioRecodeHelper; @@ -172,9 +172,6 @@ @Override public void initData() { - largeTypeBeans = new ArrayList<>(); - smallTypeBeans = new ArrayList<>(); - orientationUtils = new OrientationUtils(this, viewBinding.videoPlayerView); //初始化不打开外部的旋转 orientationUtils.setEnable(false); @@ -434,6 +431,8 @@ commonDataViewModel.obtainSmallType(eorc, typeId); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷类型"); } } }); @@ -460,6 +459,8 @@ typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷大类"); } } });