diff --git a/.idea/misc.xml b/.idea/misc.xml index e218332..0ae6045 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -26,6 +26,7 @@ + @@ -68,7 +69,9 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index e218332..0ae6045 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -26,6 +26,7 @@ + @@ -68,7 +69,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 5de8d78..62d78b2 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -2,6 +2,7 @@ import android.os.Handler; import android.os.Message; +import android.text.TextUtils; import android.view.View; import androidx.annotation.NonNull; @@ -12,6 +13,7 @@ import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.model.VerifiedCaseModel; import com.casic.dcms.utils.LocaleConstant; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.view.verify.VerifiedDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; @@ -125,6 +127,14 @@ adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @Override public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); + } + } viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index e218332..0ae6045 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -26,6 +26,7 @@ + @@ -68,7 +69,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 5de8d78..62d78b2 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -2,6 +2,7 @@ import android.os.Handler; import android.os.Message; +import android.text.TextUtils; import android.view.View; import androidx.annotation.NonNull; @@ -12,6 +13,7 @@ import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.model.VerifiedCaseModel; import com.casic.dcms.utils.LocaleConstant; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.view.verify.VerifiedDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; @@ -125,6 +127,14 @@ adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @Override public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); + } + } viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/model/VerifiedCaseModel.java b/app/src/main/java/com/casic/dcms/model/VerifiedCaseModel.java index 4dc061b..59b2847 100644 --- a/app/src/main/java/com/casic/dcms/model/VerifiedCaseModel.java +++ b/app/src/main/java/com/casic/dcms/model/VerifiedCaseModel.java @@ -62,16 +62,16 @@ } public static class RowsModel { - private String isPostpone; - private String preState; + private int isPostpone; + private int preState; private String description; - private String source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; private String processId; - private String caseState; + private int caseState; private String id; private String shopId; private String fieldintro; @@ -80,30 +80,34 @@ private String preOperator; private String lng; private String isOvertime; - private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; private String eorc; - private String currRoleId; private String caseid; private String casetypeCode; private String nodeLimittime; private String sourceName; private String reportTime; + private String currDeptId; + private String currRoleName; + private String currDeptName; + private String currRoleId; + private String onedeptName; - public String getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(String isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getPreState() { + public int getPreState() { return preState; } - public void setPreState(String preState) { + public void setPreState(int preState) { this.preState = preState; } @@ -115,11 +119,11 @@ this.description = description; } - public String getSource() { + public int getSource() { return source; } - public void setSource(String source) { + public void setSource(int source) { this.source = source; } @@ -163,11 +167,11 @@ this.processId = processId; } - public String getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(String caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -235,12 +239,12 @@ this.isOvertime = isOvertime; } - public String getCurrRoleName() { - return currRoleName; + public String getFileIdVerify() { + return fileIdVerify; } - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; } public String getCasetypeDetailCode() { @@ -267,14 +271,6 @@ this.eorc = eorc; } - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - public String getCaseid() { return caseid; } @@ -314,6 +310,46 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } }