diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 1c30a11..682e948 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -16,13 +16,13 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.presenter.CaseCommonSentencePresenterImpl; +import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseUpdateSupervisePresenterImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; +import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; +import com.casic.dcms.mvp.view.ICommonSentenceView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -44,7 +44,7 @@ import cn.jzvd.JzvdStd; public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseCommonSentenceView, ICaseUpdateSuperviseView { + ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { private Context context = CaseTodoDetailActivity.this; @BindView(R.id.caseNumberView) @@ -75,8 +75,8 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; - private CaseCommonSentencePresenterImpl commonSentencePresenter; - private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; + private ComSentencePresenterImpl sentencePresenter; + private UpdateSupervisePresenterImpl updateSupervisePresenter; @Override public int initLayoutView() { @@ -95,8 +95,8 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - commonSentencePresenter = new CaseCommonSentencePresenterImpl(this); - updateSupervisePresenter = new CaseUpdateSupervisePresenterImpl(this); + sentencePresenter = new ComSentencePresenterImpl(this); + updateSupervisePresenter = new UpdateSupervisePresenterImpl(this); } @Override @@ -129,7 +129,7 @@ OtherUtils.showCaseProcess(this, data.getProcessId()); break; case R.id.caseCommonSentenceLayout: - commonSentencePresenter.onReadyRetrofitRequest(); + sentencePresenter.onReadyRetrofitRequest(); break; case R.id.submitButton: submitCase();//案卷提交 @@ -205,12 +205,12 @@ } @Override - public void obtainCommonSentenceData(CommonSentenceBean resultBean) { + public void obtainCommonSentenceData(ComSentenceBean resultBean) { if (resultBean.isSuccess()) { - List dataBeans = resultBean.getData(); + List dataBeans = resultBean.getData(); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("常用语句"); - for (CommonSentenceBean.DataBean dataBean : dataBeans) { + for (ComSentenceBean.DataBean dataBean : dataBeans) { sheetBuilder.addItem(dataBean.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -218,7 +218,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - CommonSentenceBean.DataBean dataBean = dataBeans.get(position); + ComSentenceBean.DataBean dataBean = dataBeans.get(position); caseCommonSentenceView.setText(dataBean.getName()); caseHandleResultView.setText(dataBean.getName()); } @@ -239,7 +239,7 @@ } @Override - public void obtainUpdateSuperviseData(ActionResultBean resultBean) { + public void obtainUpdateData(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷督办提交成功", ToastHelper.SUCCESS); //案卷办完以后通知待办和已办刷新数据 @@ -267,8 +267,8 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (commonSentencePresenter != null) { - commonSentencePresenter.disposeRetrofitRequest(); + if (sentencePresenter != null) { + sentencePresenter.disposeRetrofitRequest(); } if (updateSupervisePresenter != null) { updateSupervisePresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 1c30a11..682e948 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -16,13 +16,13 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.presenter.CaseCommonSentencePresenterImpl; +import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseUpdateSupervisePresenterImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; +import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; +import com.casic.dcms.mvp.view.ICommonSentenceView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -44,7 +44,7 @@ import cn.jzvd.JzvdStd; public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseCommonSentenceView, ICaseUpdateSuperviseView { + ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { private Context context = CaseTodoDetailActivity.this; @BindView(R.id.caseNumberView) @@ -75,8 +75,8 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; - private CaseCommonSentencePresenterImpl commonSentencePresenter; - private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; + private ComSentencePresenterImpl sentencePresenter; + private UpdateSupervisePresenterImpl updateSupervisePresenter; @Override public int initLayoutView() { @@ -95,8 +95,8 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - commonSentencePresenter = new CaseCommonSentencePresenterImpl(this); - updateSupervisePresenter = new CaseUpdateSupervisePresenterImpl(this); + sentencePresenter = new ComSentencePresenterImpl(this); + updateSupervisePresenter = new UpdateSupervisePresenterImpl(this); } @Override @@ -129,7 +129,7 @@ OtherUtils.showCaseProcess(this, data.getProcessId()); break; case R.id.caseCommonSentenceLayout: - commonSentencePresenter.onReadyRetrofitRequest(); + sentencePresenter.onReadyRetrofitRequest(); break; case R.id.submitButton: submitCase();//案卷提交 @@ -205,12 +205,12 @@ } @Override - public void obtainCommonSentenceData(CommonSentenceBean resultBean) { + public void obtainCommonSentenceData(ComSentenceBean resultBean) { if (resultBean.isSuccess()) { - List dataBeans = resultBean.getData(); + List dataBeans = resultBean.getData(); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("常用语句"); - for (CommonSentenceBean.DataBean dataBean : dataBeans) { + for (ComSentenceBean.DataBean dataBean : dataBeans) { sheetBuilder.addItem(dataBean.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -218,7 +218,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - CommonSentenceBean.DataBean dataBean = dataBeans.get(position); + ComSentenceBean.DataBean dataBean = dataBeans.get(position); caseCommonSentenceView.setText(dataBean.getName()); caseHandleResultView.setText(dataBean.getName()); } @@ -239,7 +239,7 @@ } @Override - public void obtainUpdateSuperviseData(ActionResultBean resultBean) { + public void obtainUpdateData(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷督办提交成功", ToastHelper.SUCCESS); //案卷办完以后通知待办和已办刷新数据 @@ -267,8 +267,8 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (commonSentencePresenter != null) { - commonSentencePresenter.disposeRetrofitRequest(); + if (sentencePresenter != null) { + sentencePresenter.disposeRetrofitRequest(); } if (updateSupervisePresenter != null) { updateSupervisePresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index 7c3c816..87c71c4 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -66,7 +66,7 @@ fragmentList.add(new DeptCaseDelayedFragment());//二级延期 fragmentList.add(new DeptCaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); - viewPager.setOffscreenPageLimit(2); + viewPager.setOffscreenPageLimit(3); viewPager.setAdapter(adapter); //绑定TabLayout tabLayout.setupWithViewPager(viewPager); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 1c30a11..682e948 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -16,13 +16,13 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.presenter.CaseCommonSentencePresenterImpl; +import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseUpdateSupervisePresenterImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; +import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; +import com.casic.dcms.mvp.view.ICommonSentenceView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -44,7 +44,7 @@ import cn.jzvd.JzvdStd; public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseCommonSentenceView, ICaseUpdateSuperviseView { + ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { private Context context = CaseTodoDetailActivity.this; @BindView(R.id.caseNumberView) @@ -75,8 +75,8 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; - private CaseCommonSentencePresenterImpl commonSentencePresenter; - private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; + private ComSentencePresenterImpl sentencePresenter; + private UpdateSupervisePresenterImpl updateSupervisePresenter; @Override public int initLayoutView() { @@ -95,8 +95,8 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - commonSentencePresenter = new CaseCommonSentencePresenterImpl(this); - updateSupervisePresenter = new CaseUpdateSupervisePresenterImpl(this); + sentencePresenter = new ComSentencePresenterImpl(this); + updateSupervisePresenter = new UpdateSupervisePresenterImpl(this); } @Override @@ -129,7 +129,7 @@ OtherUtils.showCaseProcess(this, data.getProcessId()); break; case R.id.caseCommonSentenceLayout: - commonSentencePresenter.onReadyRetrofitRequest(); + sentencePresenter.onReadyRetrofitRequest(); break; case R.id.submitButton: submitCase();//案卷提交 @@ -205,12 +205,12 @@ } @Override - public void obtainCommonSentenceData(CommonSentenceBean resultBean) { + public void obtainCommonSentenceData(ComSentenceBean resultBean) { if (resultBean.isSuccess()) { - List dataBeans = resultBean.getData(); + List dataBeans = resultBean.getData(); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("常用语句"); - for (CommonSentenceBean.DataBean dataBean : dataBeans) { + for (ComSentenceBean.DataBean dataBean : dataBeans) { sheetBuilder.addItem(dataBean.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -218,7 +218,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - CommonSentenceBean.DataBean dataBean = dataBeans.get(position); + ComSentenceBean.DataBean dataBean = dataBeans.get(position); caseCommonSentenceView.setText(dataBean.getName()); caseHandleResultView.setText(dataBean.getName()); } @@ -239,7 +239,7 @@ } @Override - public void obtainUpdateSuperviseData(ActionResultBean resultBean) { + public void obtainUpdateData(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷督办提交成功", ToastHelper.SUCCESS); //案卷办完以后通知待办和已办刷新数据 @@ -267,8 +267,8 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (commonSentencePresenter != null) { - commonSentencePresenter.disposeRetrofitRequest(); + if (sentencePresenter != null) { + sentencePresenter.disposeRetrofitRequest(); } if (updateSupervisePresenter != null) { updateSupervisePresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index 7c3c816..87c71c4 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -66,7 +66,7 @@ fragmentList.add(new DeptCaseDelayedFragment());//二级延期 fragmentList.add(new DeptCaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); - viewPager.setOffscreenPageLimit(2); + viewPager.setOffscreenPageLimit(3); viewPager.setAdapter(adapter); //绑定TabLayout tabLayout.setupWithViewPager(viewPager); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java index 95ed227..eb1042c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCasePostponeFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptPostponeCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.presenter.DeptPostponeListPresenterImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCasePostponeFragment extends BaseFragment implements IDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private DeptPostponeListPresenterImpl postponeListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptPostponeCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + postponeListPresenter = new DeptPostponeListPresenterImpl(this); + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCasePostponeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCasePostponeFragment deptCaseFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + deptCaseFragment.isRefresh = true; + //刷新之后页码重置 + deptCaseFragment.pageIndex = 1; + deptCaseFragment.postponeListPresenter.onReadyRetrofitRequest(deptCaseFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (deptCaseFragment.isRefresh || deptCaseFragment.isLoadMore) { + deptCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (deptCaseFragment.dataBeans.size() == 0) { + deptCaseFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + deptCaseFragment.emptyView.hide(); + deptCaseFragment.adapter = new DeptPostponeCaseAdapter(deptCaseFragment.context, deptCaseFragment.dataBeans); + deptCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(deptCaseFragment.context)); + deptCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(deptCaseFragment.context, DividerItemDecoration.VERTICAL)); + deptCaseFragment.caseRecyclerView.setAdapter(deptCaseFragment.adapter); + deptCaseFragment.adapter.setOnItemClickListener(new DeptPostponeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(deptCaseFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", deptCaseFragment.dataBeans.get(position).getId()); +// deptCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainDeptCaseResult(DeptCaseBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (postponeListPresenter != null) { + postponeListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 1c30a11..682e948 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -16,13 +16,13 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.presenter.CaseCommonSentencePresenterImpl; +import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseUpdateSupervisePresenterImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; +import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; +import com.casic.dcms.mvp.view.ICommonSentenceView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -44,7 +44,7 @@ import cn.jzvd.JzvdStd; public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseCommonSentenceView, ICaseUpdateSuperviseView { + ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { private Context context = CaseTodoDetailActivity.this; @BindView(R.id.caseNumberView) @@ -75,8 +75,8 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; - private CaseCommonSentencePresenterImpl commonSentencePresenter; - private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; + private ComSentencePresenterImpl sentencePresenter; + private UpdateSupervisePresenterImpl updateSupervisePresenter; @Override public int initLayoutView() { @@ -95,8 +95,8 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - commonSentencePresenter = new CaseCommonSentencePresenterImpl(this); - updateSupervisePresenter = new CaseUpdateSupervisePresenterImpl(this); + sentencePresenter = new ComSentencePresenterImpl(this); + updateSupervisePresenter = new UpdateSupervisePresenterImpl(this); } @Override @@ -129,7 +129,7 @@ OtherUtils.showCaseProcess(this, data.getProcessId()); break; case R.id.caseCommonSentenceLayout: - commonSentencePresenter.onReadyRetrofitRequest(); + sentencePresenter.onReadyRetrofitRequest(); break; case R.id.submitButton: submitCase();//案卷提交 @@ -205,12 +205,12 @@ } @Override - public void obtainCommonSentenceData(CommonSentenceBean resultBean) { + public void obtainCommonSentenceData(ComSentenceBean resultBean) { if (resultBean.isSuccess()) { - List dataBeans = resultBean.getData(); + List dataBeans = resultBean.getData(); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("常用语句"); - for (CommonSentenceBean.DataBean dataBean : dataBeans) { + for (ComSentenceBean.DataBean dataBean : dataBeans) { sheetBuilder.addItem(dataBean.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -218,7 +218,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - CommonSentenceBean.DataBean dataBean = dataBeans.get(position); + ComSentenceBean.DataBean dataBean = dataBeans.get(position); caseCommonSentenceView.setText(dataBean.getName()); caseHandleResultView.setText(dataBean.getName()); } @@ -239,7 +239,7 @@ } @Override - public void obtainUpdateSuperviseData(ActionResultBean resultBean) { + public void obtainUpdateData(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷督办提交成功", ToastHelper.SUCCESS); //案卷办完以后通知待办和已办刷新数据 @@ -267,8 +267,8 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (commonSentencePresenter != null) { - commonSentencePresenter.disposeRetrofitRequest(); + if (sentencePresenter != null) { + sentencePresenter.disposeRetrofitRequest(); } if (updateSupervisePresenter != null) { updateSupervisePresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index 7c3c816..87c71c4 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -66,7 +66,7 @@ fragmentList.add(new DeptCaseDelayedFragment());//二级延期 fragmentList.add(new DeptCaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); - viewPager.setOffscreenPageLimit(2); + viewPager.setOffscreenPageLimit(3); viewPager.setAdapter(adapter); //绑定TabLayout tabLayout.setupWithViewPager(viewPager); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java index 95ed227..eb1042c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCasePostponeFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptPostponeCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.presenter.DeptPostponeListPresenterImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCasePostponeFragment extends BaseFragment implements IDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private DeptPostponeListPresenterImpl postponeListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptPostponeCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + postponeListPresenter = new DeptPostponeListPresenterImpl(this); + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCasePostponeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCasePostponeFragment deptCaseFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + deptCaseFragment.isRefresh = true; + //刷新之后页码重置 + deptCaseFragment.pageIndex = 1; + deptCaseFragment.postponeListPresenter.onReadyRetrofitRequest(deptCaseFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (deptCaseFragment.isRefresh || deptCaseFragment.isLoadMore) { + deptCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (deptCaseFragment.dataBeans.size() == 0) { + deptCaseFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + deptCaseFragment.emptyView.hide(); + deptCaseFragment.adapter = new DeptPostponeCaseAdapter(deptCaseFragment.context, deptCaseFragment.dataBeans); + deptCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(deptCaseFragment.context)); + deptCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(deptCaseFragment.context, DividerItemDecoration.VERTICAL)); + deptCaseFragment.caseRecyclerView.setAdapter(deptCaseFragment.adapter); + deptCaseFragment.adapter.setOnItemClickListener(new DeptPostponeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(deptCaseFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", deptCaseFragment.dataBeans.get(position).getId()); +// deptCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainDeptCaseResult(DeptCaseBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (postponeListPresenter != null) { + postponeListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index eba27bd..09d0163 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -13,7 +13,8 @@ import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; -import com.casic.dcms.bean.CommonSentenceBean; +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.bean.DeptCaseBean; import com.casic.dcms.bean.DeptTreeBean; import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; @@ -359,7 +360,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable obtainCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -499,6 +500,36 @@ @Query("offset") int offset); /** + * 三包处罚 + *

+ * http://111.198.10.15:11409/case/update + */ + @FormUrlEncoded + @POST("/case/update") + Observable handlePackageCase(@Header("token") String token, + @Field("id") String id, + @Field("punishType") String punishType, + @Field("punishRemarks") String punishRemarks, + @Field("punishTime") String punishTime, + @Field("punishImage") String punishImage); + + /** + * 商铺变更 + *

+ * http://111.198.10.15:11409/change/apply + */ + @FormUrlEncoded + @POST("/shop/change/apply") + Observable changeShopInfo(@Header("token") String token, + @Field("merchantId") String merchantId, + @Field("rentStatus") String rentStatus, + @Field("merchantName") String merchantName, + @Field("contactName") String contactName, + @Field("contactPhone") String contactPhone, + @Field("images") String images, + @Field("applySource") String applySource); + + /** * 二级派遣员待办任务 *

* http://111.198.10.15:11409/case/workListPage?offset=1&limit=15 @@ -529,32 +560,12 @@ @Query("offset") int offset); /** - * 三包处罚 + * 二级缓办待处理 *

- * http://111.198.10.15:11409/case/update + * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ - @FormUrlEncoded - @POST("/case/update") - Observable handlePackageCase(@Header("token") String token, - @Field("id") String id, - @Field("punishType") String punishType, - @Field("punishRemarks") String punishRemarks, - @Field("punishTime") String punishTime, - @Field("punishImage") String punishImage); - - /** - * 商铺变更 - *

- * http://111.198.10.15:11409/change/apply - */ - @FormUrlEncoded - @POST("/shop/change/apply") - Observable changeShopInfo(@Header("token") String token, - @Field("merchantId") String merchantId, - @Field("rentStatus") String rentStatus, - @Field("merchantName") String merchantName, - @Field("contactName") String contactName, - @Field("contactPhone") String contactPhone, - @Field("images") String images, - @Field("applySource") String applySource); + @GET("/case/secIsPostponeListPage") + Observable obtainPostponeListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); } diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java new file mode 100644 index 0000000..be0e8aa --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptPostponeCaseAdapter.java @@ -0,0 +1,94 @@ +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.bean.DeptCaseBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +public class DeptPostponeCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptPostponeCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptPostponeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptPostponeCaseAdapter.ItemViewHolder holder, 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 TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private 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(DeptCaseBean.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/bean/ComSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java new file mode 100644 index 0000000..d11514b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/ComSentenceBean.java @@ -0,0 +1,78 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class ComSentenceBean { + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * name : 请及时处理 + * id : 156 + * value : 请及时处理 + */ + + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java b/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java deleted file mode 100644 index 8de58a4..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CommonSentenceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CommonSentenceBean { - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * name : 请及时处理 - * id : 156 - * value : 请及时处理 - */ - - private String name; - private String id; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java new file mode 100644 index 0000000..f397599 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/DeptCaseBean.java @@ -0,0 +1,366 @@ +package com.casic.dcms.bean; + +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 String description; + private String createUserName; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private String currDeptId; + private int caseState; + private String id; + private String reportSupervisorId; + private String fieldintro; + private String lat; + private String caseStateName; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String currDeptName; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String createUser; + private String nodeLimittime; + private String sourceName; + 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 String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + 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 getReportSupervisorId() { + return reportSupervisorId; + } + + public void setReportSupervisorId(String reportSupervisorId) { + this.reportSupervisorId = reportSupervisorId; + } + + 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 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 getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + 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/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java deleted file mode 100644 index b3e5dc4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCommonSentenceModelImpl implements ICaseCommonSentenceModel { - - private OnGetCommonSentenceListener sentenceListener; - - public CaseCommonSentenceModelImpl(OnGetCommonSentenceListener commonSentenceListener) { - this.sentenceListener = commonSentenceListener; - } - - public interface OnGetCommonSentenceListener { - void onSuccess(CommonSentenceBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getCommonSentenceResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - sentenceListener.onFailure(e); - } - } - - @Override - public void onNext(CommonSentenceBean resultBean) { - if (resultBean != null) { - sentenceListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java deleted file mode 100644 index 9bc3cde..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseUpdateSuperviseModelImpl implements ICaseUpdateSuperviseModel { - - private OnUpdateSuperviseListener listener; - - public CaseUpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { - this.listener = updateSuperviseListener; - } - - /** - * 数据回调接口 - */ - public interface OnUpdateSuperviseListener { - void onSuccess(ActionResultBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java new file mode 100644 index 0000000..bd9ddf8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ComSentenceModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class ComSentenceModelImpl implements IComSentenceModel { + + private OnGetSentenceListener sentenceListener; + + public ComSentenceModelImpl(OnGetSentenceListener sentenceListener) { + this.sentenceListener = sentenceListener; + } + + public interface OnGetSentenceListener { + void onSuccess(ComSentenceBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest() { + Observable observable = RetrofitServiceManager.getCommonSentenceResult(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + sentenceListener.onFailure(e); + } + } + + @Override + public void onNext(ComSentenceBean resultBean) { + if (resultBean != null) { + sentenceListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java new file mode 100644 index 0000000..dc386af --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptPostponeListModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class DeptPostponeListModelImpl implements IDeptPostponeModel { + + private OnGetCaseListListener listener; + + public DeptPostponeListModelImpl(OnGetCaseListListener caseListListener) { + this.listener = caseListListener; + } + + public interface OnGetCaseListListener { + void onSuccess(DeptCaseBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getPostponeListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(DeptCaseBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java deleted file mode 100644 index 263ef6c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCommonSentenceModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCommonSentenceModel { - Subscription sendRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java deleted file mode 100644 index 518d602..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseUpdateSuperviseModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseUpdateSuperviseModel { - Subscription sendRetrofitRequest(String id, String superviseRemarks); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java new file mode 100644 index 0000000..2a4bea4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IComSentenceModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IComSentenceModel { + Subscription sendRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java new file mode 100644 index 0000000..df678f1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IDeptPostponeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IDeptPostponeModel { + Subscription sendRetrofitRequest(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java new file mode 100644 index 0000000..58b56de --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateSuperviseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IUpdateSuperviseModel { + Subscription sendRetrofitRequest(String id, String superviseRemarks); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java new file mode 100644 index 0000000..ddb554a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateSuperviseModelImpl.java @@ -0,0 +1,53 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UpdateSuperviseModelImpl implements IUpdateSuperviseModel { + + private OnUpdateSuperviseListener listener; + + public UpdateSuperviseModelImpl(OnUpdateSuperviseListener updateSuperviseListener) { + this.listener = updateSuperviseListener; + } + + /** + * 数据回调接口 + */ + public interface OnUpdateSuperviseListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java deleted file mode 100644 index 6b65f13..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCommonSentencePresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseCommonSentenceModelImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; - -public class CaseCommonSentencePresenterImpl extends BasePresenter implements ICaseCommonSentencePresenter, - CaseCommonSentenceModelImpl.OnGetCommonSentenceListener { - - private ICaseCommonSentenceView view; - private CaseCommonSentenceModelImpl actionModel; - - public CaseCommonSentencePresenterImpl(ICaseCommonSentenceView commonSentenceView) { - this.view = commonSentenceView; - actionModel = new CaseCommonSentenceModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendRetrofitRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CommonSentenceBean resultBean) { - view.obtainCommonSentenceData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java deleted file mode 100644 index 2a85f2d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseUpdateSuperviseModelImpl; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; - -public class CaseUpdateSupervisePresenterImpl extends BasePresenter implements ICaseUpdateSupervisePresenter, - CaseUpdateSuperviseModelImpl.OnUpdateSuperviseListener { - - private ICaseUpdateSuperviseView view; - private CaseUpdateSuperviseModelImpl actionModel; - - public CaseUpdateSupervisePresenterImpl(ICaseUpdateSuperviseView updateSuperviseView) { - this.view = updateSuperviseView; - actionModel = new CaseUpdateSuperviseModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String id, String superviseRemarks) { - view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainUpdateSuperviseData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java new file mode 100644 index 0000000..4c16e5d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ComSentencePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.ComSentenceModelImpl; +import com.casic.dcms.mvp.view.ICommonSentenceView; + +public class ComSentencePresenterImpl extends BasePresenter implements IComSentencePresenter, + ComSentenceModelImpl.OnGetSentenceListener { + + private ICommonSentenceView view; + private ComSentenceModelImpl actionModel; + + public ComSentencePresenterImpl(ICommonSentenceView sentenceView) { + this.view = sentenceView; + actionModel = new ComSentenceModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.sendRetrofitRequest()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ComSentenceBean resultBean) { + view.obtainCommonSentenceData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java new file mode 100644 index 0000000..c769ec1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/DeptPostponeListPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.DeptPostponeListModelImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; + +public class DeptPostponeListPresenterImpl extends BasePresenter implements IDeptCasePresenter, + DeptPostponeListModelImpl.OnGetCaseListListener { + + private IDeptCaseListView view; + private DeptPostponeListModelImpl actionModel; + + public DeptPostponeListPresenterImpl(IDeptCaseListView deptCaseListView) { + this.view = deptCaseListView; + actionModel = new DeptPostponeListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(DeptCaseBean resultBean) { + view.obtainDeptCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java deleted file mode 100644 index 1f8bd09..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCommonSentencePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCommonSentencePresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java deleted file mode 100644 index f61f9b2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseUpdateSupervisePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseUpdateSupervisePresenter { - void onReadyRetrofitRequest(String id, String superviseRemarks); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java new file mode 100644 index 0000000..553f33d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IComSentencePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IComSentencePresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java new file mode 100644 index 0000000..2a62848 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IDeptCasePresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java new file mode 100644 index 0000000..ee2ec8a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUpdateSupervisePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IUpdateSupervisePresenter { + void onReadyRetrofitRequest(String id, String superviseRemarks); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java new file mode 100644 index 0000000..0a6cdb0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdateSupervisePresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UpdateSuperviseModelImpl; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; + +public class UpdateSupervisePresenterImpl extends BasePresenter implements IUpdateSupervisePresenter, + UpdateSuperviseModelImpl.OnUpdateSuperviseListener { + + private IUpdateSuperviseView view; + private UpdateSuperviseModelImpl actionModel; + + public UpdateSupervisePresenterImpl(IUpdateSuperviseView updateSuperviseView) { + this.view = updateSuperviseView; + actionModel = new UpdateSuperviseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String superviseRemarks) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, superviseRemarks)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainUpdateData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java deleted file mode 100644 index 9c7b08b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCommonSentenceView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CommonSentenceBean; - -public interface ICaseCommonSentenceView { - void obtainCommonSentenceData(CommonSentenceBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java deleted file mode 100644 index fcec62f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseUpdateSuperviseView { - void showProgress(); - - void hideProgress(); - - void obtainUpdateSuperviseData(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java new file mode 100644 index 0000000..860bbc9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICommonSentenceView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ComSentenceBean; + +public interface ICommonSentenceView { + void obtainCommonSentenceData(ComSentenceBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java new file mode 100644 index 0000000..3587749 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptCaseBean; + +public interface IDeptCaseListView { + void obtainDeptCaseResult(DeptCaseBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java new file mode 100644 index 0000000..539dc3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateSuperviseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IUpdateSuperviseView { + void showProgress(); + + void hideProgress(); + + void obtainUpdateData(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 981b54e..189f49c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -222,6 +222,13 @@ public void onClick(QMUIDialog dialog, int index) { dialog.dismiss(); + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 caseClassView.setText(""); caseLargeClassView.setText(""); caseSmallClassView.setText(""); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 1c30a11..682e948 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -16,13 +16,13 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CommonSentenceBean; -import com.casic.dcms.mvp.presenter.CaseCommonSentencePresenterImpl; +import com.casic.dcms.bean.ComSentenceBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseUpdateSupervisePresenterImpl; -import com.casic.dcms.mvp.view.ICaseCommonSentenceView; +import com.casic.dcms.mvp.presenter.UpdateSupervisePresenterImpl; +import com.casic.dcms.mvp.presenter.ComSentencePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseUpdateSuperviseView; +import com.casic.dcms.mvp.view.IUpdateSuperviseView; +import com.casic.dcms.mvp.view.ICommonSentenceView; import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; @@ -44,7 +44,7 @@ import cn.jzvd.JzvdStd; public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseCommonSentenceView, ICaseUpdateSuperviseView { + ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { private Context context = CaseTodoDetailActivity.this; @BindView(R.id.caseNumberView) @@ -75,8 +75,8 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; - private CaseCommonSentencePresenterImpl commonSentencePresenter; - private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; + private ComSentencePresenterImpl sentencePresenter; + private UpdateSupervisePresenterImpl updateSupervisePresenter; @Override public int initLayoutView() { @@ -95,8 +95,8 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - commonSentencePresenter = new CaseCommonSentencePresenterImpl(this); - updateSupervisePresenter = new CaseUpdateSupervisePresenterImpl(this); + sentencePresenter = new ComSentencePresenterImpl(this); + updateSupervisePresenter = new UpdateSupervisePresenterImpl(this); } @Override @@ -129,7 +129,7 @@ OtherUtils.showCaseProcess(this, data.getProcessId()); break; case R.id.caseCommonSentenceLayout: - commonSentencePresenter.onReadyRetrofitRequest(); + sentencePresenter.onReadyRetrofitRequest(); break; case R.id.submitButton: submitCase();//案卷提交 @@ -205,12 +205,12 @@ } @Override - public void obtainCommonSentenceData(CommonSentenceBean resultBean) { + public void obtainCommonSentenceData(ComSentenceBean resultBean) { if (resultBean.isSuccess()) { - List dataBeans = resultBean.getData(); + List dataBeans = resultBean.getData(); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("常用语句"); - for (CommonSentenceBean.DataBean dataBean : dataBeans) { + for (ComSentenceBean.DataBean dataBean : dataBeans) { sheetBuilder.addItem(dataBean.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -218,7 +218,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - CommonSentenceBean.DataBean dataBean = dataBeans.get(position); + ComSentenceBean.DataBean dataBean = dataBeans.get(position); caseCommonSentenceView.setText(dataBean.getName()); caseHandleResultView.setText(dataBean.getName()); } @@ -239,7 +239,7 @@ } @Override - public void obtainUpdateSuperviseData(ActionResultBean resultBean) { + public void obtainUpdateData(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷督办提交成功", ToastHelper.SUCCESS); //案卷办完以后通知待办和已办刷新数据 @@ -267,8 +267,8 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (commonSentencePresenter != null) { - commonSentencePresenter.disposeRetrofitRequest(); + if (sentencePresenter != null) { + sentencePresenter.disposeRetrofitRequest(); } if (updateSupervisePresenter != null) { updateSupervisePresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index 7c3c816..87c71c4 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -66,7 +66,7 @@ fragmentList.add(new DeptCaseDelayedFragment());//二级延期 fragmentList.add(new DeptCaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); - viewPager.setOffscreenPageLimit(2); + viewPager.setOffscreenPageLimit(3); viewPager.setAdapter(adapter); //绑定TabLayout tabLayout.setupWithViewPager(viewPager); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java index 95ed227..eb1042c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCasePostponeFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptPostponeCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.DeptCaseBean; +import com.casic.dcms.mvp.presenter.DeptPostponeListPresenterImpl; +import com.casic.dcms.mvp.view.IDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCasePostponeFragment extends BaseFragment implements IDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private DeptPostponeListPresenterImpl postponeListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptPostponeCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + postponeListPresenter = new DeptPostponeListPresenterImpl(this); + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + postponeListPresenter.onReadyRetrofitRequest(pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCasePostponeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCasePostponeFragment deptCaseFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + deptCaseFragment.isRefresh = true; + //刷新之后页码重置 + deptCaseFragment.pageIndex = 1; + deptCaseFragment.postponeListPresenter.onReadyRetrofitRequest(deptCaseFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (deptCaseFragment.isRefresh || deptCaseFragment.isLoadMore) { + deptCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (deptCaseFragment.dataBeans.size() == 0) { + deptCaseFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + deptCaseFragment.emptyView.hide(); + deptCaseFragment.adapter = new DeptPostponeCaseAdapter(deptCaseFragment.context, deptCaseFragment.dataBeans); + deptCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(deptCaseFragment.context)); + deptCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(deptCaseFragment.context, DividerItemDecoration.VERTICAL)); + deptCaseFragment.caseRecyclerView.setAdapter(deptCaseFragment.adapter); + deptCaseFragment.adapter.setOnItemClickListener(new DeptPostponeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(deptCaseFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", deptCaseFragment.dataBeans.get(position).getId()); +// deptCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainDeptCaseResult(DeptCaseBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (postponeListPresenter != null) { + postponeListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index eba27bd..09d0163 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -13,7 +13,8 @@ import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; -import com.casic.dcms.bean.CommonSentenceBean; +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.bean.DeptCaseBean; import com.casic.dcms.bean.DeptTreeBean; import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; @@ -359,7 +360,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable obtainCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -499,6 +500,36 @@ @Query("offset") int offset); /** + * 三包处罚 + *

+ * http://111.198.10.15:11409/case/update + */ + @FormUrlEncoded + @POST("/case/update") + Observable handlePackageCase(@Header("token") String token, + @Field("id") String id, + @Field("punishType") String punishType, + @Field("punishRemarks") String punishRemarks, + @Field("punishTime") String punishTime, + @Field("punishImage") String punishImage); + + /** + * 商铺变更 + *

+ * http://111.198.10.15:11409/change/apply + */ + @FormUrlEncoded + @POST("/shop/change/apply") + Observable changeShopInfo(@Header("token") String token, + @Field("merchantId") String merchantId, + @Field("rentStatus") String rentStatus, + @Field("merchantName") String merchantName, + @Field("contactName") String contactName, + @Field("contactPhone") String contactPhone, + @Field("images") String images, + @Field("applySource") String applySource); + + /** * 二级派遣员待办任务 *

* http://111.198.10.15:11409/case/workListPage?offset=1&limit=15 @@ -529,32 +560,12 @@ @Query("offset") int offset); /** - * 三包处罚 + * 二级缓办待处理 *

- * http://111.198.10.15:11409/case/update + * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ - @FormUrlEncoded - @POST("/case/update") - Observable handlePackageCase(@Header("token") String token, - @Field("id") String id, - @Field("punishType") String punishType, - @Field("punishRemarks") String punishRemarks, - @Field("punishTime") String punishTime, - @Field("punishImage") String punishImage); - - /** - * 商铺变更 - *

- * http://111.198.10.15:11409/change/apply - */ - @FormUrlEncoded - @POST("/shop/change/apply") - Observable changeShopInfo(@Header("token") String token, - @Field("merchantId") String merchantId, - @Field("rentStatus") String rentStatus, - @Field("merchantName") String merchantName, - @Field("contactName") String contactName, - @Field("contactPhone") String contactPhone, - @Field("images") String images, - @Field("applySource") String applySource); + @GET("/case/secIsPostponeListPage") + Observable obtainPostponeListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 89472de..68c39cf 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -15,7 +15,8 @@ import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; -import com.casic.dcms.bean.CommonSentenceBean; +import com.casic.dcms.bean.ComSentenceBean; +import com.casic.dcms.bean.DeptCaseBean; import com.casic.dcms.bean.DeptTreeBean; import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; @@ -410,7 +411,7 @@ /** * 获取常见语句 */ - public static Observable getCommonSentenceResult() { + public static Observable getCommonSentenceResult() { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.obtainCommonSentence(AuthenticationHelper.getToken()); @@ -540,6 +541,30 @@ } /** + * 三包处罚 + */ + public static Observable getHandlePackageResult(String id, String punishType, + String punishRemarks, String punishTime, + String punishImage) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.handlePackageCase(AuthenticationHelper.getToken(), id, punishType, punishRemarks, + punishTime, punishImage); + } + + /** + * 商铺变更 + */ + public static Observable getShopChangeResult(String merchantId, String merchantName, + String contactName, String contactPhone, + String images) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.changeShopInfo(AuthenticationHelper.getToken(), merchantId, "1", + merchantName, contactName, contactPhone, images, "1"); + } + + /** * 二级派遣员待办任务 */ public static Observable getWorkListResult(int offset) { @@ -570,26 +595,12 @@ } /** - * 三包处罚 + * 二级缓办待处理 */ - public static Observable getHandlePackageResult(String id, String punishType, - String punishRemarks, String punishTime, - String punishImage) { + public static Observable getPostponeListResult(int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.handlePackageCase(AuthenticationHelper.getToken(), id, punishType, punishRemarks, - punishTime, punishImage); - } - - /** - * 商铺变更 - */ - public static Observable getShopChangeResult(String merchantId, String merchantName, - String contactName, String contactPhone, - String images) { - Retrofit retrofit = createRetrofit(); - RetrofitService service = retrofit.create(RetrofitService.class); - return service.changeShopInfo(AuthenticationHelper.getToken(), merchantId, "1", - merchantName, contactName, contactPhone, images, "1"); + return service.obtainPostponeListPage(AuthenticationHelper.getToken(), + Constant.PAGE_LIMIT, offset); } }