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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> 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 6ec54e1..7a332f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -89,7 +88,7 @@ @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.caseCheckOptView) - EditText caseCheckOptView; + TextView caseCheckOptView; @BindView(R.id.caseCheckStatusView) TextView caseCheckStatusView; @BindView(R.id.submitButton) @@ -260,7 +259,7 @@ caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -273,11 +272,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000"> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000"> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000"> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000"> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000"> urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -297,11 +297,12 @@ List urls = new ArrayList<>(); String[] split = processImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); @@ -315,6 +316,7 @@ imageAdapter.setDeleteView(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); + //TODO 服务器返回数据缺少此字段，暂时注掉 // caseHandleTimeView.setText(); } } @@ -361,7 +363,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setVisibility(View.VISIBLE); caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseCheckRecyclerView.setAdapter(imageAdapter); @@ -408,6 +409,7 @@ CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); caseCheckStatusView.setText(dataBean.getNextOperation()); + caseCheckOptView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } }).build().show(); 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 7a172d1..0792ba3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -53,6 +53,10 @@ TextView caseHandleView; @BindView(R.id.casePicRecyclerView) RecyclerView casePicRecyclerView; + @BindView(R.id.caseHandleRecyclerView) + RecyclerView caseHandleRecyclerView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.emptyImageView) TextView emptyImageView; @@ -130,19 +134,21 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseSituationView.setText(data.getDescription()); - String images = data.getFileIdVerify(); - if (!TextUtils.isEmpty(images)) { + //核实图片 + String verifyImages = data.getFileIdVerify(); + if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); - String[] split = images.split(","); + String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -159,6 +165,56 @@ emptyImageView.setText("该案卷无图片材料"); emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + + //处理图片 + 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") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + + //核查图片 + String checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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 180a499..46aa7ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -57,6 +57,8 @@ RecyclerView casePicRecyclerView; @BindView(R.id.caseHandleImageView) RecyclerView caseHandleImageView; + @BindView(R.id.caseCheckRecyclerView) + RecyclerView caseCheckRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; @@ -105,12 +107,13 @@ casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); + //核实图片 String images = data.getFileIdVerify(); if (!TextUtils.isEmpty(images)) { List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } @@ -129,18 +132,18 @@ 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")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); @@ -154,11 +157,29 @@ 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 checkImages = data.getFileIdCheck(); + if (!TextUtils.isEmpty(checkImages)) { + List urls = new ArrayList<>(); + String[] split = checkImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.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/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 8235354..5903ac1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -158,11 +158,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -366,7 +367,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setVisibility(View.VISIBLE); caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseHandleRecyclerView.setAdapter(imageAdapter); 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 cfad9f0..20e9f96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -105,13 +105,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -131,13 +130,12 @@ List urls = new ArrayList<>(); String[] split = handleImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { 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); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 7d13f72..0344417 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RadioButton; @@ -22,6 +23,7 @@ import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -32,7 +34,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.List; @@ -60,6 +61,7 @@ private CaseHandleListPresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; + private BitmapDrawable caseDrawable = null; @Override public int initLayoutView() { @@ -81,11 +83,9 @@ @Override public void initData() { mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(18000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(36000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); - arcGISMap.setMinScale(36000); - arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); @@ -158,9 +158,23 @@ */ @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { - Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_HANDLE); + } + } else { + ToastHelper.showToast("当前没有[处理中]的案卷", ToastHelper.ERROR); + } } } @@ -169,15 +183,22 @@ */ @Override public void obtainCheckListResult(CaseCheckBean resultBean) { - Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); - for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { - double lng = Double.parseDouble(bean.getLng()); - double lat = Double.parseDouble(bean.getLat()); - Point point = new Point(lng, lat, mapView.getSpatialReference()); - - addPictureMarker(point); + if (rowsBeans.size() >= 1) { + for (CaseCheckBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_CHECK); + } + } else { + ToastHelper.showToast("当前没有[待核查]的案卷", ToastHelper.ERROR); } } } @@ -187,14 +208,40 @@ */ @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { - Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); +// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - + List rowsBeans = resultBean.getData().getRows(); + if (rowsBeans.size() >= 1) { + for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + String lng = bean.getLng(); + String lat = bean.getLat(); + if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { + Log.d(TAG, "案卷经纬度异常"); + break; + } + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + addPictureMarker(point, Constant.CASE_VERIFY); + } + } else { + ToastHelper.showToast("当前没有[待核实]的案卷", ToastHelper.ERROR); + } } } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + private void addPictureMarker(Point point, int caseStatus) { + switch (caseStatus) { + case Constant.CASE_HANDLE: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); + break; + case Constant.CASE_VERIFY: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_verify); + break; + case Constant.CASE_CHECK: + caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_check); + break; + default: + break; + } PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 d38a451..f02c712 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -160,13 +160,12 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 07ad6b2..68b6925 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -106,7 +106,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg")) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 8e43853..91eb6bc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -116,7 +116,7 @@ caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); - caseHandleView.setText(data.getUrgeRemarks()); + caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); caseSituationView.setText(data.getDescription()); @@ -127,11 +127,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); 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 1c85b2b..7c2bd0e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -100,7 +100,7 @@ @BindView(R.id.emptyVideoView) TextView emptyVideoView; @BindView(R.id.caseOpinionView) - EditText caseOpinionView; + TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; @BindView(R.id.caseVerifyRecyclerView) @@ -216,11 +216,12 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); - casePicRecyclerView.setVisibility(View.VISIBLE); casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); casePicRecyclerView.setAdapter(imageAdapter); @@ -571,34 +572,6 @@ } @Override - protected void onDestroy() { - super.onDestroy(); - if (caseDetailPresenter != null) { - caseDetailPresenter.disposeRetrofitRequest(); - } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (caseNextNodePresenter != null) { - caseNextNodePresenter.disposeRetrofitRequest(); - } - if (caseHandlePresenter != null) { - caseHandlePresenter.disposeRetrofitRequest(); - } - if (mediaPlayer != null) { - mediaPlayer.reset(); - mediaPlayer.release(); - mediaPlayer = null; - } - } - - @Override public void showProgress() { submitDialog.show(); } @@ -630,7 +603,6 @@ } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setVisibility(View.VISIBLE); caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); caseVerifyRecyclerView.setAdapter(imageAdapter); @@ -676,6 +648,7 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); + caseOpinionView.setText(dataBean.getNextOperation()); caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -684,4 +657,32 @@ ToastHelper.showToast("该案卷无下级流转节点", ToastHelper.ERROR); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + if (caseLargeClassPresenter != null) { + caseLargeClassPresenter.disposeRetrofitRequest(); + } + if (caseSmallClassPresenter != null) { + caseSmallClassPresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (caseNextNodePresenter != null) { + caseNextNodePresenter.disposeRetrofitRequest(); + } + if (caseHandlePresenter != null) { + caseHandlePresenter.disposeRetrofitRequest(); + } + if (mediaPlayer != null) { + mediaPlayer.reset(); + mediaPlayer.release(); + mediaPlayer = null; + } + } } diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 12f6868..d258c0b 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -116,7 +116,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_blue); + BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_handle); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 5cadf31..abb4436 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -51,6 +51,10 @@ public static final int PAGE_LIMIT = 15; + public static final int CASE_HANDLE = 0; + public static final int CASE_VERIFY = 1; + public static final int CASE_CHECK = 2; + public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; public static final String NOTICE_MSG = "receivePush"; diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 5cf0b7e..a3c7a00 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -24,7 +24,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -67,7 +65,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -75,8 +72,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/tttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/tttttt" /> @@ -111,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -119,8 +115,8 @@ android:id="@+id/caseHandleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttttttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttttttt" /> @@ -131,7 +127,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理结果" android:textSize="@dimen/textFontSize" /> @@ -154,7 +149,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理时间" android:textSize="@dimen/textFontSize" /> @@ -189,13 +183,13 @@ + android:layout_height="wrap_content" /> @@ -207,7 +201,6 @@ - diff --git a/app/src/main/res/layout/activity_case_checked_detail.xml b/app/src/main/res/layout/activity_case_checked_detail.xml index 7092848..cea48fb 100644 --- a/app/src/main/res/layout/activity_case_checked_detail.xml +++ b/app/src/main/res/layout/activity_case_checked_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -36,8 +35,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e01d8cf..d213316 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -47,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理状态" android:textSize="@dimen/textFontSize" /> @@ -68,7 +66,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -77,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:textSize="@dimen/textFontSize" /> @@ -89,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -110,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -130,8 +124,7 @@ @@ -161,6 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" android:gravity="end" @@ -185,7 +178,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷情况" android:textSize="@dimen/textFontSize" /> @@ -194,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/v" android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -208,7 +201,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -216,6 +208,7 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/vv" /> @@ -228,7 +221,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理图片" android:textSize="@dimen/textFontSize" /> @@ -236,6 +228,7 @@ android:id="@+id/caseHandleImageView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_toEndOf="@id/tttt" /> @@ -244,6 +237,26 @@ + + + + + + + + + + android:layout_toEndOf="@id/t" /> @@ -136,13 +135,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 2d5ae0b..957b6a8 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -146,8 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_toEndOf="@id/ttt" /> diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 828ce36..e9a7161 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="派遣时间" android:textSize="@dimen/textFontSize" /> @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="完成时限" android:textSize="@dimen/textFontSize" /> @@ -71,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷图片" android:textSize="@dimen/textFontSize" /> @@ -79,8 +76,8 @@ android:id="@+id/casePicRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/ttt" - android:visibility="gone" /> + android:layout_marginStart="25dp" + android:layout_toEndOf="@id/ttt" /> + android:layout_toEndOf="@id/vv" /> - @@ -255,13 +248,13 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 97d8da4..39ca7aa 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷编号" android:textSize="@dimen/textFontSize" /> @@ -20,7 +19,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -32,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> @@ -42,7 +39,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -54,7 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷大类" android:textSize="@dimen/textFontSize" /> @@ -64,7 +59,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -76,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="案卷小类" android:textSize="@dimen/textFontSize" /> @@ -86,7 +79,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -97,8 +89,7 @@ @@ -128,9 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" - android:layout_toEndOf="@id/t" - android:gravity="end" android:textSize="@dimen/textFontSize" /> @@ -162,7 +148,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@id/tt" + android:layout_marginStart="25dp" android:textSize="@dimen/textFontSize" /> @@ -174,7 +160,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:drawableEnd="@mipmap/point" android:text="处理意见" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index e6a382b..cbe36db 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -2,7 +2,7 @@ + android:background="#0D000000">