diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d45910..4c01f54 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,22 +29,29 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59c2608..eb654a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -85,7 +85,7 @@ - + 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 d20a05e..94e5e24 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -29,13 +29,12 @@ @NonNull @Override - public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new CaseHandledAdapter.ItemViewHolder(view); + 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 CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,7 +53,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 3a80c94..6c4a6a6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -12,21 +12,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import java.util.List; /** - * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + * {@link PackageCaseListAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} */ public class DeptTodoOrHandledAdapter extends RecyclerView.Adapter { - private final List dataBeans; + private final List dataBeans; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public DeptTodoOrHandledAdapter(Context context, List dataRows) { + public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; layoutInflater = LayoutInflater.from(context); } @@ -72,7 +72,7 @@ } @SuppressLint("SetTextI18n") - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { + void bindView(DeptCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java deleted file mode 100644 index ab916fe..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ /dev/null @@ -1,91 +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.OvertimeCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class OvertimeCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public OvertimeCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - 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(); - } - - 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(OvertimeCaseBean.DataDTO.RowsDTO 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/OvertimeCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java new file mode 100644 index 0000000..b79da9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseListAdapter.java @@ -0,0 +1,91 @@ +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.OvertimeCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class OvertimeCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public OvertimeCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(OvertimeCaseBean.DataDTO.RowsDTO 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/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java deleted file mode 100644 index a71c9f1..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; -import com.casic.dcms.mvvm.model.PunishTimesBean; -import com.casic.dcms.mvvm.model.PunishTypeBean; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageCaseAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageCaseAdapter"; - private final Context context; - private final List dataBeans; - private final LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private final Gson gson; - - public PackageCaseAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageCaseAdapter.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 ImageView leftImageView; - private final TextView caseTitleView; - private final TextView caseDateView; - private final RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageOrDeptBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - 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/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java new file mode 100644 index 0000000..c1f6a25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -0,0 +1,142 @@ +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.PackageCaseBean; +import com.casic.dcms.utils.StringHelper; +import com.google.gson.Gson; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class PackageCaseListAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private final Gson gson; + + public PackageCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_package_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 caseDateView; + private final RecyclerView casePunishView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + casePunishView = itemView.findViewById(R.id.casePunishView); + } + + + void bindView(PackageCaseBean.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())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); +// if (punishTypeBean.getData().size() != 0) { +// //获取商铺处罚次数 +// HttpRequestHelper.doRequest(LocaleConstant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { +// @Override +// public void onSuccess(ResponseBody resultBean) { +// try { +// PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); +// +// adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); +// LinearLayoutManager layoutManager = new LinearLayoutManager(context); +// layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); +// punishRecyclerView.setLayoutManager(layoutManager); +// punishRecyclerView.setAdapter(adapter); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onFailure(Throwable throwable) { +// +// } +// }); + } + } + + 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/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java deleted file mode 100644 index 1301830..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.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.UrgentCaseBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class UrgentCaseAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public UrgentCaseAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new UrgentCaseAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.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(UrgentCaseBean.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/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java new file mode 100644 index 0000000..fdccbc4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -0,0 +1,91 @@ +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.UrgentCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class UrgentCaseListAdapter extends RecyclerView.Adapter { + + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public UrgentCaseListAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + 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(); + } + + 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(UrgentCaseBean.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/mvvm/model/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java new file mode 100644 index 0000000..1a4ac47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/DeptCaseBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +/** + * 二级派遣员-已办/待办 + */ +public class DeptCaseBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + 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 int caseState; + private String id; + 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; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + 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; + } + + 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/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java new file mode 100644 index 0000000..0f2aab3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/model/PackageCaseBean.java @@ -0,0 +1,373 @@ +package com.casic.dcms.mvvm.model; + +import java.util.List; + +public class PackageCaseBean { + + private int code; + private DataDTO data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataDTO getData() { + return data; + } + + public void setData(DataDTO data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataDTO { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsDTO { + private int isPostpone; + private String description; + 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 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 nodeLimittime; + private String taskName; + private String sourceName; + private String fileIdProcess; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + 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; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getCurrDeptId() { + return currDeptId; + } + + public void setCurrDeptId(String currDeptId) { + this.currDeptId = currDeptId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + 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 getFileIdVerify() { + return fileIdVerify; + } + + public void setFileIdVerify(String fileIdVerify) { + this.fileIdVerify = fileIdVerify; + } + + 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 getCurrDeptName() { + return currDeptName; + } + + public void setCurrDeptName(String currDeptName) { + this.currDeptName = currDeptName; + } + + 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 getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileIdProcess() { + return fileIdProcess; + } + + public void setFileIdProcess(String fileIdProcess) { + this.fileIdProcess = fileIdProcess; + } + + public String getReportTime() { + return reportTime; + } + + 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/PackageOrDeptBean.java b/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java deleted file mode 100644 index b63a25e..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/model/PackageOrDeptBean.java +++ /dev/null @@ -1,351 +0,0 @@ -package com.casic.dcms.mvvm.model; - -import java.util.List; - -/** - * 三包处置和二级派遣员-已办/待办，共用一个Bean - */ -public class PackageOrDeptBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private int isPostpone; - private int preState; - private String description; - 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 int caseState; - private String id; - 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; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - 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; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - 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; - } - - 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/view/HandlePackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java deleted file mode 100644 index b3f2ab2..0000000 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandlePackageCaseActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvvm.view; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.databinding.ActivityThreePackageBinding; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; -import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; -import com.casic.dcms.utils.LocaleConstant; -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; - -import java.util.ArrayList; -import java.util.List; - -public class HandlePackageCaseActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); - - viewBinding.titleBarLayout.titleView.setText("三包处置"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new PackageTodoFragment()); - fragmentList.add(new PackageHandledFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); - viewBinding.viewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java new file mode 100644 index 0000000..cfc821f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvvm.view; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.databinding.ActivityThreePackageBinding; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; +import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +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; +import java.util.List; + +public class PackageCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + ImmerseStatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); + ImmersionBar.with(this).statusBarDarkFont(false).init(); + + viewBinding.titleBarLayout.titleView.setText("三包处置"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new PackageTodoFragment()); + fragmentList.add(new PackageHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), LocaleConstant.CASE_PAGE_TITLES, fragmentList); + viewBinding.viewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 29ad674..9f8ff1f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.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,8 +40,9 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.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/HomePageFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java index 8dcee84..de55bbf 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/HomePageFragment.java @@ -19,7 +19,7 @@ import com.casic.dcms.mvvm.view.DataAnalysisActivity; import com.casic.dcms.mvvm.view.DeptHandleActivity; import com.casic.dcms.mvvm.view.HandleCaseActivity; -import com.casic.dcms.mvvm.view.HandlePackageCaseActivity; +import com.casic.dcms.mvvm.view.PackageCaseActivity; import com.casic.dcms.mvvm.view.OvertimeCaseActivity; import com.casic.dcms.mvvm.view.PackageCaseUploadActivity; import com.casic.dcms.mvvm.view.PersonOnlineActivity; @@ -137,7 +137,7 @@ intent.setClass(requireContext(), PublicToiletActivity.class); break; case "三包处置": - intent.setClass(requireContext(), HandlePackageCaseActivity.class); + intent.setClass(requireContext(), PackageCaseActivity.class); break; case "商铺变更": intent.setClass(requireContext(), ChangeShopInfoActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java index 200b1c3..0a65c11 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseHandledFragment.java @@ -10,7 +10,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.CaseDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,7 +29,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java index 4f9a302..8d780d7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseProcessFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean resultBean) { if (resultBean.isSuccess()) { - 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/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java index 48b2284..a807209 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/dept/DeptCaseTodoFragment.java @@ -11,7 +11,7 @@ import com.casic.dcms.adapter.DeptTodoOrHandledAdapter; import com.casic.dcms.databinding.FragmentDeptCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.mvvm.view.DeptTodoDetailActivity; import com.casic.dcms.mvvm.vm.DeptHandleViewModel; import com.casic.dcms.utils.LocaleConstant; @@ -30,7 +30,7 @@ private WeakReferenceHandler weakReferenceHandler; private DeptHandleViewModel handleViewModel; private DeptTodoOrHandledAdapter adapter; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - handleViewModel.deptCaseListModel.observe(this, new Observer() { + handleViewModel.deptCaseListModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(DeptCaseBean 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/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java index 7b4e132..07c31b7 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java index 97a7d39..718b22b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/overtime/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OvertimeCaseAdapter; +import com.casic.dcms.adapter.OvertimeCaseListAdapter; import com.casic.dcms.databinding.FragmentOvertimeCaseBinding; import com.casic.dcms.mvvm.model.OvertimeCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private OvertimeCaseAdapter adapter; + private OvertimeCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new OvertimeCaseAdapter(requireContext(), dataBeans); + adapter = new OvertimeCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new OvertimeCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java index c557adc..17fad48 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageHandledFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageHandledDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -28,8 +28,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -74,11 +74,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -118,9 +118,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java index 1897beb..086a521 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/threepkg/PackageTodoFragment.java @@ -8,9 +8,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.PackageCaseAdapter; +import com.casic.dcms.adapter.PackageCaseListAdapter; import com.casic.dcms.databinding.FragmentPackageCaseBinding; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.view.PackageTodoDetailActivity; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -29,8 +29,8 @@ private static final String TAG = "PackageTodoFragment"; private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private PackageCaseAdapter adapter; - private List dataBeans = new ArrayList<>(); + private PackageCaseListAdapter adapter; + private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -75,11 +75,11 @@ } }); - caseViewModel.shopCaseModel.observe(this, new Observer() { + caseViewModel.shopCaseModel.observe(this, new Observer() { @Override - public void onChanged(PackageOrDeptBean resultBean) { + public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new PackageCaseAdapter(requireContext(), dataBeans); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java index 8eb9847..faa4640 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseHandledFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoHandledDetailActivity; @@ -28,7 +28,7 @@ private static final String TAG = "CaseHandledFragment"; private WeakReferenceHandler weakReferenceHandler; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java index b90f45c..3b662f6 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/urgent/CaseTodoFragment.java @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.UrgentCaseAdapter; +import com.casic.dcms.adapter.UrgentCaseListAdapter; import com.casic.dcms.databinding.FragmentUrgentCaseBinding; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.mvvm.view.CaseTodoDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseTodoFragment"; private static WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; - private UrgentCaseAdapter adapter; + private UrgentCaseListAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; @@ -119,9 +119,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new UrgentCaseAdapter(requireContext(), dataBeans); + adapter = new UrgentCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new UrgentCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index 3d694ce..8b8a61d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -9,7 +9,7 @@ import com.casic.dcms.mvvm.model.CaseListResultBean; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.model.OvertimeCaseBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.PackageCaseBean; import com.casic.dcms.mvvm.model.UrgentCaseBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; @@ -34,7 +34,7 @@ public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData shopCaseModel = new MutableLiveData<>(); + public MutableLiveData shopCaseModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); @@ -261,7 +261,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java index 30b153a..ace874b 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/DeptHandleViewModel.java @@ -4,7 +4,7 @@ import com.casic.dcms.mvvm.model.AuthorizeOrAdjustBean; import com.casic.dcms.mvvm.model.DelayedOrPostBean; -import com.casic.dcms.mvvm.model.PackageOrDeptBean; +import com.casic.dcms.mvvm.model.DeptCaseBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; @@ -20,7 +20,7 @@ public class DeptHandleViewModel extends BaseViewModel { private final Gson gson = new Gson(); - public MutableLiveData deptCaseListModel = new MutableLiveData<>(); + public MutableLiveData deptCaseListModel = new MutableLiveData<>(); public MutableLiveData deptAuthorizeOrAdjustCaseListModel = new MutableLiveData<>(); public MutableLiveData deptDelayedOrPostBeanCaseListModel = new MutableLiveData<>(); @@ -53,7 +53,7 @@ String response = responseBody.string(); int responseCode = StringHelper.separateResponseCode(response); if (responseCode == 200) { - PackageOrDeptBean resultBean = gson.fromJson(response, new TypeToken() { + DeptCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); deptCaseListModel.setValue(resultBean); } diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index e07a43b..e563c7f 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_package_rv.xml b/app/src/main/res/layout/item_package_rv.xml new file mode 100644 index 0000000..f6f1a1b --- /dev/null +++ b/app/src/main/res/layout/item_package_rv.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + \ No newline at end of file