diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + + + + + + + + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java new file mode 100644 index 0000000..d0e0ec6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -0,0 +1,23 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.content.Intent; + +import com.casic.dcms.ui.BigPictureActivity; +import com.casic.dcms.ui.CaseProcessActivity; + +public class OtherUtils { + //查看大图 + public static void showBigImage(Context context, String imagePath) { + Intent intent = new Intent(context, BigPictureActivity.class); + intent.putExtra("path", imagePath); + context.startActivity(intent); + } + + //查看案卷处理记录 + public static void showCaseProcess(Context context, String processId) { + Intent intent = new Intent(context, CaseProcessActivity.class); + intent.putExtra("processId", processId); + context.startActivity(intent); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java new file mode 100644 index 0000000..d0e0ec6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -0,0 +1,23 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.content.Intent; + +import com.casic.dcms.ui.BigPictureActivity; +import com.casic.dcms.ui.CaseProcessActivity; + +public class OtherUtils { + //查看大图 + public static void showBigImage(Context context, String imagePath) { + Intent intent = new Intent(context, BigPictureActivity.class); + intent.putExtra("path", imagePath); + context.startActivity(intent); + } + + //查看案卷处理记录 + public static void showCaseProcess(Context context, String processId) { + Intent intent = new Intent(context, CaseProcessActivity.class); + intent.putExtra("processId", processId); + context.startActivity(intent); + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5aeb8f6..012d8b7 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -56,18 +56,42 @@ public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { - Log.d(TAG, "appendCompleteURL文件路径不对 => " + url); return ""; } - String data = url.replace("\\", "/"); - String imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; - Log.d(TAG, "appendCompleteURL: "+imagePath); + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "appendCompleteURL: " + imagePath); return imagePath; } public static String reformatURL(List urls) { if (urls.isEmpty()) { - Log.d(TAG, "reformatURL文件路径不对 => " + urls); return ""; } StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java new file mode 100644 index 0000000..d0e0ec6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -0,0 +1,23 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.content.Intent; + +import com.casic.dcms.ui.BigPictureActivity; +import com.casic.dcms.ui.CaseProcessActivity; + +public class OtherUtils { + //查看大图 + public static void showBigImage(Context context, String imagePath) { + Intent intent = new Intent(context, BigPictureActivity.class); + intent.putExtra("path", imagePath); + context.startActivity(intent); + } + + //查看案卷处理记录 + public static void showCaseProcess(Context context, String processId) { + Intent intent = new Intent(context, CaseProcessActivity.class); + intent.putExtra("processId", processId); + context.startActivity(intent); + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5aeb8f6..012d8b7 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -56,18 +56,42 @@ public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { - Log.d(TAG, "appendCompleteURL文件路径不对 => " + url); return ""; } - String data = url.replace("\\", "/"); - String imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; - Log.d(TAG, "appendCompleteURL: "+imagePath); + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "appendCompleteURL: " + imagePath); return imagePath; } public static String reformatURL(List urls) { if (urls.isEmpty()) { - Log.d(TAG, "reformatURL文件路径不对 => " + urls); return ""; } StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index fdeb450..3d29f84 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -68,7 +68,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="10dp" android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2070c95..670618e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java new file mode 100644 index 0000000..d0e0ec6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -0,0 +1,23 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.content.Intent; + +import com.casic.dcms.ui.BigPictureActivity; +import com.casic.dcms.ui.CaseProcessActivity; + +public class OtherUtils { + //查看大图 + public static void showBigImage(Context context, String imagePath) { + Intent intent = new Intent(context, BigPictureActivity.class); + intent.putExtra("path", imagePath); + context.startActivity(intent); + } + + //查看案卷处理记录 + public static void showCaseProcess(Context context, String processId) { + Intent intent = new Intent(context, CaseProcessActivity.class); + intent.putExtra("processId", processId); + context.startActivity(intent); + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5aeb8f6..012d8b7 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -56,18 +56,42 @@ public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { - Log.d(TAG, "appendCompleteURL文件路径不对 => " + url); return ""; } - String data = url.replace("\\", "/"); - String imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; - Log.d(TAG, "appendCompleteURL: "+imagePath); + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "appendCompleteURL: " + imagePath); return imagePath; } public static String reformatURL(List urls) { if (urls.isEmpty()) { - Log.d(TAG, "reformatURL文件路径不对 => " + urls); return ""; } StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index fdeb450..3d29f84 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -68,7 +68,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="10dp" android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> 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 8ff5257..ee36d9f 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -114,6 +114,7 @@ @@ -133,10 +136,9 @@ @@ -145,7 +147,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/tt" + android:layout_toEndOf="@id/ttt" android:visibility="gone" /> @@ -172,7 +174,7 @@ + urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - urls.add(StringHelper.appendCompleteURL(s)); + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); + } } ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); imageAdapter.setMediaList(urls); @@ -154,8 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -163,12 +164,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainCommonSentenceData(CommonSentenceBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java new file mode 100644 index 0000000..278e4e9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -0,0 +1,143 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.CaseDetailBean; +import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailView; +import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.OnClick; + +public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + + private Context context = CaseTodoHandledDetailActivity.this; + @BindView(R.id.detailTopLayout) + QMUITopBarLayout detailTopLayout; + @BindView(R.id.caseNumberView) + TextView caseNumberView; + @BindView(R.id.caseHandleStatusView) + TextView caseHandleStatusView; + @BindView(R.id.caseTypeView) + TextView caseTypeView; + @BindView(R.id.caseLargeTypeView) + TextView caseLargeTypeView; + @BindView(R.id.caseSmallTypeView) + TextView caseSmallTypeView; + @BindView(R.id.caseCommunityView) + TextView caseCommunityView; + @BindView(R.id.casePlaceView) + TextView casePlaceView; + @BindView(R.id.caseDescriptionView) + TextView caseDescriptionView; + @BindView(R.id.caseSuperviseView) + TextView caseSuperviseView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; + + private CaseDetailPresenterImpl caseDetailPresenter; + private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + + @Override + public int initLayoutView() { + return R.layout.activity_case_todo_handled_detail; + } + + @Override + protected void setupTopBarLayout() { + detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + String id = getIntent().getStringExtra("id"); + caseDetailPresenter = new CaseDetailPresenterImpl(this); + caseDetailPresenter.onReadyRetrofitRequest(id); + } + + @Override + public void initEvent() { + + } + + @Override + public void obtainCaseDetailData(CaseDetailBean resultBean) { + if (resultBean.isSuccess()) { + this.data = resultBean.getData().get(0); + caseNumberView.setText(data.getCaseid()); + caseHandleStatusView.setText(data.getCaseStateName()); + caseTypeView.setText(data.getEorcName()); + caseLargeTypeView.setText(data.getCasetypeName()); + caseSmallTypeView.setText(data.getCasetypeDetailName()); + caseCommunityView.setText(data.getCommunityName()); + casePlaceView.setText(data.getFieldintro()); + caseDescriptionView.setText(data.getDescription()); + caseSuperviseView.setText(data.getSuperviseRemarks()); + + //图片 + 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")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, urls.get(position)); + } + }); + imageAdapter.setDeleteView(false); + } + } + } + + @OnClick({R.id.caseHandleLayout}) + @Override + public void onClick(View v) { + if (v.getId() == R.id.caseHandleLayout) { + OtherUtils.showCaseProcess(this, data.getProcessId()); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (caseDetailPresenter != null) { + caseDetailPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4a9818a..02845d2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -45,6 +45,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -424,12 +425,6 @@ } }; - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { @@ -554,8 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 42d8621..c7c5022 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -32,6 +32,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -299,12 +300,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { // Log.d(TAG, "obtainLargeClassData: " + gson.toJson(largeClassBean)); @@ -369,8 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 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 14e360c..b1ee400 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; @@ -21,6 +22,7 @@ import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -35,6 +37,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { + private Context context = CaseVerifiedDetailActivity.this; @BindView(R.id.detailTopLayout) QMUITopBarLayout detailTopLayout; @BindView(R.id.caseNumberView) @@ -136,8 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -203,12 +205,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.locationMapView}) @Override public void onClick(View v) { 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 af6a9fe..0dcdd9b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.AudioManager; @@ -42,6 +43,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -67,6 +69,7 @@ public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + private Context context = CaseVerifyDetailActivity.this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -226,8 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(urls.get(position)); + OtherUtils.showBigImage(context, urls.get(position)); } }); imageAdapter.setDeleteView(false); @@ -293,12 +295,6 @@ } } - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.locationMapView, R.id.addImageView, R.id.caseConditionLayout, R.id.submitButton}) @Override public void onClick(View v) { @@ -624,8 +620,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 38f8b6c..0cc54c9 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +25,7 @@ import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -46,6 +48,7 @@ public class FivePackageUploadActivity extends BaseCaseActivity implements View.OnClickListener , IUploadFileView, ICaseSubmitCaseView { + private Context context = FivePackageUploadActivity.this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityView) @@ -271,8 +274,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - //查看大图 - showBigImage(realPaths.get(position)); + OtherUtils.showBigImage(context, realPaths.get(position)); } }); //删除按钮点击事件 @@ -293,10 +295,4 @@ public void obtainUploadVideoResult(ActionResultBean resultBean) { } - - private void showBigImage(String path) { - Intent intent = new Intent(this, BigPictureActivity.class); - intent.putExtra("path", path); - startActivity(intent); - } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8604eee..4b5d45b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.mvp.presenter.OvertimeCaseListPresenterImpl; import com.casic.dcms.mvp.view.IOvertimeCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index f5d7959..92eabcd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.mvp.presenter.UrgentCaseListPresenterImpl; import com.casic.dcms.mvp.view.IUrgentCaseListView; +import com.casic.dcms.ui.CaseTodoHandledDetailActivity; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -128,10 +130,9 @@ adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { -// Intent intent = new Intent(context, CaseDetailActivity.class); -// intent.putExtra("id", dataRows.get(position).getId()); -// startActivity( intent); - ToastHelper.showToast("详情页正在完善中", ToastHelper.ERROR); + Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", dataBeans.get(position).getId()); + startActivity(intent); } }); } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java b/app/src/main/java/com/casic/dcms/utils/HttpHelper.java deleted file mode 100644 index 0edc9de..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.casic.dcms.utils; - -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import rx.Observable; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class HttpHelper { - private static final String TAG = "HttpHelper"; - - public static void doHttpRequest(String token) { - Observable.create((Observable.OnSubscribe) subscriber -> - new OkHttpClient().newCall(new Request.Builder() - .addHeader("token", token) - .url("http://111.198.10.15:11409/user/info/") - .get() - .build()) - .enqueue(new Callback() { - @Override - public void onFailure(@NotNull Call call, @NotNull IOException e) { - subscriber.onError(e); - } - - @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { - subscriber.onNext(response); - } - })).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Subscriber() { - @Override - public void onError(Throwable e) { - Log.d(TAG, "onError: " + e); - } - - @Override - public void onNext(Response response) { - if (response == null) { - Log.e(TAG, "请求出错: ", new NullPointerException()); - return; - } - try { - Log.d(TAG, "onNext: " + response.body().string()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onCompleted() { - Log.d(TAG, "onCompleted: 请求完成"); - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java new file mode 100644 index 0000000..d0e0ec6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -0,0 +1,23 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.content.Intent; + +import com.casic.dcms.ui.BigPictureActivity; +import com.casic.dcms.ui.CaseProcessActivity; + +public class OtherUtils { + //查看大图 + public static void showBigImage(Context context, String imagePath) { + Intent intent = new Intent(context, BigPictureActivity.class); + intent.putExtra("path", imagePath); + context.startActivity(intent); + } + + //查看案卷处理记录 + public static void showCaseProcess(Context context, String processId) { + Intent intent = new Intent(context, CaseProcessActivity.class); + intent.putExtra("processId", processId); + context.startActivity(intent); + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5aeb8f6..012d8b7 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -56,18 +56,42 @@ public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { - Log.d(TAG, "appendCompleteURL文件路径不对 => " + url); return ""; } - String data = url.replace("\\", "/"); - String imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; - Log.d(TAG, "appendCompleteURL: "+imagePath); + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "appendCompleteURL: " + imagePath); return imagePath; } public static String reformatURL(List urls) { if (urls.isEmpty()) { - Log.d(TAG, "reformatURL文件路径不对 => " + urls); return ""; } StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index fdeb450..3d29f84 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -68,7 +68,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="10dp" android:drawableEnd="@mipmap/point" android:text="案卷类型" android:textSize="@dimen/textFontSize" /> 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 8ff5257..ee36d9f 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -114,6 +114,7 @@ @@ -133,10 +136,9 @@ @@ -145,7 +147,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:layout_toEndOf="@id/tt" + android:layout_toEndOf="@id/ttt" android:visibility="gone" /> @@ -172,7 +174,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file