diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index 9aaef7e..a258200 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index 9aaef7e..a258200 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index 6cbbc83..303dcb2 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/.idea/misc.xml b/.idea/misc.xml index 5ac53be..7c57967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,12 +24,15 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index 9aaef7e..a258200 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index 6cbbc83..303dcb2 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 596068a..93a25fd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -12,6 +12,7 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index 9aaef7e..a258200 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index 6cbbc83..303dcb2 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 596068a..93a25fd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -12,6 +12,7 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java deleted file mode 100644 index 4c4052f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseHandleAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseHandleAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - this.layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandleAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - -// private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); -// leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } -// leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} 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 6c1cc5b..d20a05e 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -19,10 +19,10 @@ public class CaseHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public CaseHandledAdapter(Context context, List dataRows) { + public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -68,7 +68,7 @@ } @SuppressLint("SetTextI18n") - void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { + void bindView(CaseHandledBean.DataDTO.RowsDTO rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java new file mode 100644 index 0000000..aade1cb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/HandleCaseListAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseHandleBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class HandleCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public HandleCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + this.layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseHandleBean.DataDTO.RowsDTO rowsBean) { + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index de27d58..6ddf67a 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -22,10 +22,10 @@ public class VerifyCaseListAdapter extends RecyclerView.Adapter { private final Context context; - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; - public VerifyCaseListAdapter(Context context, List dataRows) { + public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); @@ -70,7 +70,7 @@ caseTimeView = itemView.findViewById(R.id.caseTimeView); } - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + void bindView(CaseVerifyBean.DataDTO.RowsDTO rowsBean) { //核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java index 3ec78e0..cf15429 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandleBean.java @@ -5,7 +5,7 @@ public class CaseHandleBean { private int code; - private DataBean data; + private DataDTO data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,10 +41,17 @@ this.success = success; } - public static class DataBean { - + public static class DataDTO { + private List rows; private int total; - private List rows; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } public int getTotal() { return total; @@ -54,42 +61,41 @@ this.total = total; } - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - + public static class RowsDTO { private int isPostpone; private String description; - private String createUserName; private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; + private String currDeptId; private int caseState; private String id; - private String reportSupervisorId; + private String shopId; private String fieldintro; private String lat; private String caseStateName; private String lng; private String isOvertime; + private String currRoleName; + private String fileIdVerify; private String casetypeDetailCode; private String onedeptid; + private String currDeptName; private String eorc; + private String currRoleId; private String caseid; private String casetypeCode; - private String createUser; private String nodeLimittime; + private String taskName; private String sourceName; + private String fileIdProcess; private String reportTime; + private String onedeptName; public int getIsPostpone() { return isPostpone; @@ -107,14 +113,6 @@ this.description = description; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public int getSource() { return source; } @@ -155,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -163,6 +177,14 @@ this.processId = processId; } + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + public int getCaseState() { return caseState; } @@ -179,12 +201,12 @@ this.id = id; } - public String getReportSupervisorId() { - return reportSupervisorId; + public String getShopId() { + return shopId; } - public void setReportSupervisorId(String reportSupervisorId) { - this.reportSupervisorId = reportSupervisorId; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -227,6 +249,22 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + public String getCasetypeDetailCode() { return casetypeDetailCode; } @@ -243,6 +281,14 @@ this.onedeptid = onedeptid; } + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + public String getEorc() { return eorc; } @@ -251,6 +297,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } @@ -267,14 +321,6 @@ this.casetypeCode = casetypeCode; } - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - public String getNodeLimittime() { return nodeLimittime; } @@ -283,6 +329,14 @@ this.nodeLimittime = nodeLimittime; } + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + public String getSourceName() { return sourceName; } @@ -291,6 +345,14 @@ this.sourceName = sourceName; } + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + public String getReportTime() { return reportTime; } @@ -298,6 +360,14 @@ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java index 17014bc..10104bf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseHandledBean.java @@ -4,24 +4,24 @@ public class CaseHandledBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -41,84 +41,75 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private String caseStateName; - private double isPostpone; - private String lng; - private String isOvertime; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private int preState; private String description; - private double source; - private String casetypeDetailCode; + private int source; private String eorcName; - private String onedeptid; private String casetypeDetailName; private String remainingTime; private String casetypeName; - private String eorc; private String processId; - private String caseid; - private double caseState; - private String casetypeCode; - private String nodeLimittime; + private int caseState; private String id; - private String sourceName; + private String shopId; private String fieldintro; private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + 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 onedeptName; + private String currUserId; + private String currUserName; + private String currDeptId; + private String currDeptName; - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } - public String getLng() { - return lng; + public int getPreState() { + return preState; } - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; + public void setPreState(int preState) { + this.preState = preState; } public String getDescription() { @@ -129,22 +120,14 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - public String getEorcName() { return eorcName; } @@ -153,14 +136,6 @@ this.eorcName = eorcName; } - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - public String getCasetypeDetailName() { return casetypeDetailName; } @@ -185,14 +160,6 @@ this.casetypeName = casetypeName; } - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - public String getProcessId() { return processId; } @@ -201,38 +168,14 @@ this.processId = processId; } - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - public String getId() { return id; } @@ -241,12 +184,12 @@ this.id = id; } - public String getSourceName() { - return sourceName; + public String getShopId() { + return shopId; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setShopId(String shopId) { + this.shopId = shopId; } public String getFieldintro() { @@ -265,6 +208,110 @@ this.lat = lat; } + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + public String getReportTime() { return reportTime; } @@ -280,6 +327,38 @@ public void setOnedeptName(String onedeptName) { this.onedeptName = onedeptName; } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public String getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } } } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java index 2f16f45..a9e404e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/mvvm/model/CaseVerifyBean.java @@ -7,24 +7,24 @@ */ public class CaseVerifyBean { - private double code; - private DataBean data; + private int code; + private DataDTO data; private String message; private boolean success; - public double getCode() { + public int getCode() { return code; } - public void setCode(double code) { + public void setCode(int code) { this.code = code; } - public DataBean getData() { + public DataDTO getData() { return data; } - public void setData(DataBean data) { + public void setData(DataDTO data) { this.data = data; } @@ -44,48 +44,51 @@ this.success = success; } - public static class DataBean { + public static class DataDTO { + private List rows; + private int total; - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } - public static class RowsBean { + public int getTotal() { + return total; + } - private double isPostpone; + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; private String description; - private double source; + private int source; private String eorcName; private String casetypeDetailName; private String remainingTime; private String casetypeName; + private String currUserId; + private String currUserName; private String processId; - private double caseState; + private int caseState; private String id; + private String shopId; private String fieldintro; private String lat; private String caseStateName; 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; @@ -94,11 +97,11 @@ private String fileIdProcess; private String reportTime; - public double getIsPostpone() { + public int getIsPostpone() { return isPostpone; } - public void setIsPostpone(double isPostpone) { + public void setIsPostpone(int isPostpone) { this.isPostpone = isPostpone; } @@ -110,11 +113,11 @@ this.description = description; } - public double getSource() { + public int getSource() { return source; } - public void setSource(double source) { + public void setSource(int source) { this.source = source; } @@ -150,6 +153,22 @@ this.casetypeName = casetypeName; } + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + public String getProcessId() { return processId; } @@ -158,11 +177,11 @@ this.processId = processId; } - public double getCaseState() { + public int getCaseState() { return caseState; } - public void setCaseState(double caseState) { + public void setCaseState(int caseState) { this.caseState = caseState; } @@ -174,6 +193,14 @@ this.id = id; } + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + public String getFieldintro() { return fieldintro; } @@ -214,6 +241,14 @@ this.isOvertime = isOvertime; } + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + public String getFileIdVerify() { return fileIdVerify; } @@ -246,6 +281,14 @@ this.eorc = eorc; } + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + public String getCaseid() { return caseid; } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 1328d81..f9419f0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -19,6 +19,7 @@ import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; import com.casic.dcms.mvvm.vm.UploadViewModel; @@ -56,6 +57,7 @@ private CaseViewModel caseViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private String id; private String changeState; private String caseReason; @@ -81,6 +83,7 @@ uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); handleImageAdapter = new EditableImageAdapter(this, 3, 13); viewBinding.addImageRecyclerView.setAdapter(handleImageAdapter); @@ -217,24 +220,7 @@ handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseHandleDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseHandleDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -256,7 +242,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { - if (handleImageAdapter.getItemCount() <= 2) { + if (handleImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -300,12 +286,47 @@ return; } } -// caseViewModel.handleOvertimeCase( -// data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult -// ); + operateViewModel.handleOvertimeCase( + data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult + ); } }); + operateViewModel.loadState.observe(this, new Observer() { + @Override + public void onChanged(LoadState loadState) { + if (loadState == LoadState.Loading) { + OtherUtils.showLoadingDialog(context, "案卷处理中，请稍后..."); + } else if (loadState == LoadState.Success) { + OtherUtils.dismissLoadingDialog(); + finish(); + } else { + EasyToast.show(context, "处理失败，请重试"); + OtherUtils.dismissLoadingDialog(); + } + } + }); + } + + private void selectPicture(){ + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseHandleDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseHandleDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java index 188c29c..10ec294 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseOnMapActivity.java @@ -139,11 +139,11 @@ public void onChanged(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseHandleBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseHandleBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { @@ -168,11 +168,11 @@ public void onChanged(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.getCode() == 200) { - List rowsBeans = resultBean.getData().getRows(); + List rowsBeans = resultBean.getData().getRows(); if (rowsBeans.size() >= 1) { List list = new ArrayList<>(); List pointList = new ArrayList<>(); - for (CaseVerifyBean.DataBean.RowsBean bean : rowsBeans) { + for (CaseVerifyBean.DataDTO.RowsDTO bean : rowsBeans) { String lng = bean.getLng(); String lat = bean.getLat(); if (TextUtils.isEmpty(lng) || TextUtils.isEmpty(lat)) { diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index f13f1d0..b9ffbe9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,14 +40,14 @@ List fragmentList = new ArrayList<>(); fragmentList.add(new CaseCheckFragment()); fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); viewBinding.checkViewPager.setAdapter(adapter); //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 17fe356..5415ae8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -14,6 +14,7 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -44,8 +45,9 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java index c6af03b..d4938c4 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseHandledFragment.java @@ -32,7 +32,7 @@ private CaseHandledAdapter adapter; private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); @Override protected void setupTopBarLayout() { @@ -78,7 +78,7 @@ @Override public void onChanged(CaseHandledBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java index 07e15cd..bddf228 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseOverTimeFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "OvertimeCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java index 7bd9367..7bc939a 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java index 578bfc1..39e35c0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/handle/CaseUrgentFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.adapter.HandleCaseListAdapter; import com.casic.dcms.databinding.FragmentHandleCaseBinding; import com.casic.dcms.mvvm.model.CaseHandleBean; import com.casic.dcms.mvvm.view.CaseHandleDetailActivity; @@ -29,8 +29,8 @@ private static final String TAG = "UrgentCaseFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private CaseHandleAdapter adapter; - private List dataBeans = new ArrayList<>(); + private HandleCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -82,7 +82,7 @@ @Override public void onChanged(CaseHandleBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -122,9 +122,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseHandleAdapter(requireContext(), dataBeans); + adapter = new HandleCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new HandleCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index 9aaef7e..a258200 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index 6cbbc83..303dcb2 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -31,7 +31,7 @@ private CaseViewModel caseViewModel; private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -80,7 +80,7 @@ @Override public void onChanged(CaseVerifyBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 596068a..93a25fd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5">