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 596d75f..180a499 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -55,6 +55,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -92,7 +94,6 @@ @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); @@ -127,12 +128,38 @@ }); imageAdapter.setDeleteView(false); } - } - int caseState = data.getCaseState(); - if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { - handleRecordLayout.setVisibility(View.GONE); - } else { - handleRecordLayout.setVisibility(View.VISIBLE); + + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + int caseState = data.getCaseState(); + if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { + handleRecordLayout.setVisibility(View.GONE); + } else { + handleRecordLayout.setVisibility(View.VISIBLE); + } } } 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 596d75f..180a499 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -55,6 +55,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -92,7 +94,6 @@ @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); @@ -127,12 +128,38 @@ }); imageAdapter.setDeleteView(false); } - } - int caseState = data.getCaseState(); - if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { - handleRecordLayout.setVisibility(View.GONE); - } else { - handleRecordLayout.setVisibility(View.VISIBLE); + + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + int caseState = data.getCaseState(); + if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { + handleRecordLayout.setVisibility(View.GONE); + } else { + handleRecordLayout.setVisibility(View.VISIBLE); + } } } 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 280ea51..cfad9f0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -51,6 +51,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; @@ -97,12 +99,15 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -119,6 +124,32 @@ }); imageAdapter.setDeleteView(false); } + + //案卷处理时候上传的图片 + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } } } 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 596d75f..180a499 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -55,6 +55,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -92,7 +94,6 @@ @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); @@ -127,12 +128,38 @@ }); imageAdapter.setDeleteView(false); } - } - int caseState = data.getCaseState(); - if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { - handleRecordLayout.setVisibility(View.GONE); - } else { - handleRecordLayout.setVisibility(View.VISIBLE); + + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + int caseState = data.getCaseState(); + if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { + handleRecordLayout.setVisibility(View.GONE); + } else { + handleRecordLayout.setVisibility(View.VISIBLE); + } } } 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 280ea51..cfad9f0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -51,6 +51,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; @@ -97,12 +99,15 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -119,6 +124,32 @@ }); imageAdapter.setDeleteView(false); } + + //案卷处理时候上传的图片 + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } } } diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 6193e94..e01d8cf 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -224,6 +224,26 @@ + + + + + + + + + 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 596d75f..180a499 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -55,6 +55,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -92,7 +94,6 @@ @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); @@ -127,12 +128,38 @@ }); imageAdapter.setDeleteView(false); } - } - int caseState = data.getCaseState(); - if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { - handleRecordLayout.setVisibility(View.GONE); - } else { - handleRecordLayout.setVisibility(View.VISIBLE); + + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + int caseState = data.getCaseState(); + if (caseState == 22 || caseState == 60 || caseState == 70 || caseState == 75 || caseState == 76 || caseState == 77 || caseState == 301) { + handleRecordLayout.setVisibility(View.GONE); + } else { + handleRecordLayout.setVisibility(View.VISIBLE); + } } } 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 280ea51..cfad9f0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -51,6 +51,8 @@ TextView caseSituationView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleImageView) + RecyclerView caseHandleImageView; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; @@ -97,12 +99,15 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -119,6 +124,32 @@ }); imageAdapter.setDeleteView(false); } + + //案卷处理时候上传的图片 + String handleImages = data.getFileIdProcess(); + if (!TextUtils.isEmpty(handleImages)) { + List urls = new ArrayList<>(); + String[] split = handleImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleImageView.setVisibility(View.VISIBLE); + caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); + caseHandleImageView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } } } diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 6193e94..e01d8cf 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -224,6 +224,26 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 3d29f84..faa06a3 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -217,8 +217,27 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> + + + + + + + + +