diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 598edfe..50e2b6b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -165,15 +165,15 @@ caseNumberView.setText(data.getCaseid()); caseOverTimeView.setText(data.getNodeLimittime()); caseHandleStatusView.setText(data.getCaseStateName().equals("") ? "案卷状态未知" : data.getCaseStateName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 598edfe..50e2b6b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -165,15 +165,15 @@ caseNumberView.setText(data.getCaseid()); caseOverTimeView.setText(data.getNodeLimittime()); caseHandleStatusView.setText(data.getCaseStateName().equals("") ? "案卷状态未知" : data.getCaseStateName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 98cdb0d..23dd4ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); caseSuperviseView.setText(data.getSuperviseRemarks()); //图片 @@ -120,7 +120,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 598edfe..50e2b6b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -165,15 +165,15 @@ caseNumberView.setText(data.getCaseid()); caseOverTimeView.setText(data.getNodeLimittime()); caseHandleStatusView.setText(data.getCaseStateName().equals("") ? "案卷状态未知" : data.getCaseStateName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 98cdb0d..23dd4ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); caseSuperviseView.setText(data.getSuperviseRemarks()); //图片 @@ -120,7 +120,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7eaa4ef..e3ed29f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -111,11 +111,11 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //图片 String images = data.getFileIdVerify(); @@ -123,7 +123,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 598edfe..50e2b6b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -165,15 +165,15 @@ caseNumberView.setText(data.getCaseid()); caseOverTimeView.setText(data.getNodeLimittime()); caseHandleStatusView.setText(data.getCaseStateName().equals("") ? "案卷状态未知" : data.getCaseStateName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 98cdb0d..23dd4ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); caseSuperviseView.setText(data.getSuperviseRemarks()); //图片 @@ -120,7 +120,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7eaa4ef..e3ed29f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -111,11 +111,11 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //图片 String images = data.getFileIdVerify(); @@ -123,7 +123,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 5e73969..033172f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -198,11 +198,11 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 int source = data.getSource(); @@ -222,7 +222,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 2a9fe67..43291f2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 4f1d38b..7eb9d95 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index 4d1ecfd..5ba056a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index 6bec1b7..9827fb0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 64e7c92..615de2d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseListResultBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -83,8 +84,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index a56fc77..57d4815 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -65,14 +67,15 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index 32dbe3f..a7f80eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index b13df60..bff7c3a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 505e219..2ab18eb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -13,6 +13,7 @@ import com.casic.dcms.R; import com.casic.dcms.bean.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; import java.util.List; @@ -73,8 +74,8 @@ eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(rowsBean.getDescription()); - casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 32c8f5c..b29da14 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -270,8 +270,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(data.getFieldintro().trim().replace(" ", "")); + caseSituationView.setText(data.getDescription().trim().replace(" ", "")); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); @@ -285,7 +285,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index f6e3271..c4f6913 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -140,9 +140,9 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String verifyImages = data.getFileIdVerify(); @@ -150,7 +150,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 13fc75d..0397912 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -105,8 +105,6 @@ } - private static final String TAG = "CaseDetailActivity"; - @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -117,8 +115,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //核实图片 String images = data.getFileIdVerify(); @@ -126,7 +124,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 9869eb3..d188e8d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -166,8 +166,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); String verifyImages = data.getFileIdVerify(); @@ -175,7 +175,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 267cf58..f5992a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseSituationView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //最初始的案卷图片 String verifyImages = data.getFileIdVerify(); @@ -119,7 +119,7 @@ List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 598edfe..50e2b6b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -165,15 +165,15 @@ caseNumberView.setText(data.getCaseid()); caseOverTimeView.setText(data.getNodeLimittime()); caseHandleStatusView.setText(data.getCaseStateName().equals("") ? "案卷状态未知" : data.getCaseStateName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { List urls = new ArrayList<>(); String[] split = verifyImages.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 98cdb0d..23dd4ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -110,8 +110,8 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); - caseDescriptionView.setText(data.getDescription()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); + caseDescriptionView.setText(StringHelper.filterString(data.getDescription())); caseSuperviseView.setText(data.getSuperviseRemarks()); //图片 @@ -120,7 +120,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7eaa4ef..e3ed29f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -111,11 +111,11 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getProcessRemarks().equals("") ? "无" : data.getProcessRemarks()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //图片 String images = data.getFileIdVerify(); @@ -123,7 +123,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 5e73969..033172f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -198,11 +198,11 @@ caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); caseCommunityView.setText(data.getCommunityName()); - casePlaceView.setText(data.getFieldintro()); + casePlaceView.setText(StringHelper.filterString(data.getFieldintro())); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); caseStartTimeView.setText(data.getCreateTime()); caseEndTimeView.setText(data.getNodeLimittime()); - caseSituationView.setText(data.getDescription()); + caseSituationView.setText(StringHelper.filterString(data.getDescription())); //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 int source = data.getSource(); @@ -222,7 +222,7 @@ List urls = new ArrayList<>(); String[] split = images.split(","); for (String s : split) { - if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + if (s.endsWith(".jpg") || s.contains(".jpeg") || s.contains(".png")) { urls.add(StringHelper.appendCompleteURL(s)); } } 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 f3364b0..38b7ac8 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -150,6 +150,21 @@ } /** + * 过滤空格，回车 + */ + public static String filterString(String s) { + if (TextUtils.isEmpty(s)) { + return s; + } + //先过滤回车换行 + Pattern p = Pattern.compile("\\s*|\t|\r|\n"); + Matcher m = p.matcher(s); + s = m.replaceAll(""); + //再过滤空格 + return s.trim().replace(" ", ""); + } + + /** * 根据item名字获取icon */ public static int obtainIcon(String item) {