diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
new file mode 100644
index 0000000..a9bf3cd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageHandledPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
new file mode 100644
index 0000000..a9bf3cd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageHandledPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
new file mode 100644
index 0000000..282542c
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageTodoPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
new file mode 100644
index 0000000..a9bf3cd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageHandledPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
new file mode 100644
index 0000000..282542c
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageTodoPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
new file mode 100644
index 0000000..8bb8c03
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
@@ -0,0 +1,37 @@
+package com.casic.dcms.mvp.presenter;
+
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.mvp.BasePresenter;
+import com.casic.dcms.mvp.model.PackageHandledModelImpl;
+import com.casic.dcms.mvp.view.IPackageHandledView;
+
+public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener {
+
+ private IPackageHandledView view;
+ private PackageHandledModelImpl actionModel;
+
+ public PackageHandledPresenterImpl(IPackageHandledView handledView) {
+ this.view = handledView;
+ actionModel = new PackageHandledModelImpl(this);
+ }
+
+ @Override
+ public void onReadyRetrofitRequest(int offset) {
+ addSubscription(actionModel.sendRetrofitRequest(offset));
+ }
+
+ @Override
+ public void disposeRetrofitRequest() {
+ unSubscription();
+ }
+
+ @Override
+ public void onSuccess(PackageHandledBean resultBean) {
+ view.obtainPackageHandledResult(resultBean);
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
new file mode 100644
index 0000000..a9bf3cd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageHandledPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
new file mode 100644
index 0000000..282542c
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageTodoPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
new file mode 100644
index 0000000..8bb8c03
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
@@ -0,0 +1,37 @@
+package com.casic.dcms.mvp.presenter;
+
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.mvp.BasePresenter;
+import com.casic.dcms.mvp.model.PackageHandledModelImpl;
+import com.casic.dcms.mvp.view.IPackageHandledView;
+
+public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener {
+
+ private IPackageHandledView view;
+ private PackageHandledModelImpl actionModel;
+
+ public PackageHandledPresenterImpl(IPackageHandledView handledView) {
+ this.view = handledView;
+ actionModel = new PackageHandledModelImpl(this);
+ }
+
+ @Override
+ public void onReadyRetrofitRequest(int offset) {
+ addSubscription(actionModel.sendRetrofitRequest(offset));
+ }
+
+ @Override
+ public void disposeRetrofitRequest() {
+ unSubscription();
+ }
+
+ @Override
+ public void onSuccess(PackageHandledBean resultBean) {
+ view.obtainPackageHandledResult(resultBean);
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java
new file mode 100644
index 0000000..90014f2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java
@@ -0,0 +1,37 @@
+package com.casic.dcms.mvp.presenter;
+
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.mvp.BasePresenter;
+import com.casic.dcms.mvp.model.PackageTodoModelImpl;
+import com.casic.dcms.mvp.view.IPackageTodoView;
+
+public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener {
+
+ private IPackageTodoView view;
+ private PackageTodoModelImpl actionModel;
+
+ public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) {
+ this.view = packageTodoView;
+ actionModel = new PackageTodoModelImpl(this);
+ }
+
+ @Override
+ public void onReadyRetrofitRequest(int offset) {
+ addSubscription(actionModel.sendRetrofitRequest(offset));
+ }
+
+ @Override
+ public void disposeRetrofitRequest() {
+ unSubscription();
+ }
+
+ @Override
+ public void onSuccess(PackageTodoBean resultBean) {
+ view.obtainPackageTodoResult(resultBean);
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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 {
+ /**
+ * isPostpone : 0
+ * preState : 50
+ * description : qk
+ * source : 2
+ * eorcName : 事件
+ * casetypeDetailName : 店面无证装修
+ * remainingTime : 超时121小时39分钟
+ * casetypeName : 市容环境
+ * currUserId : 1196382448976011266
+ * currUserName : 房可鑫
+ * processId : 2858459
+ * caseState : 51
+ * id : 1395556091536478210
+ * shopId : 993
+ * fieldintro : dd
+ * lat : 27.770741787627987
+ * caseStateName : 现场核查
+ * preOperator : 1394585656711962626
+ * lng : 116.05567507482945
+ * isOvertime : 1
+ * currRoleName : 监督员
+ * casetypeDetailCode : 02
+ * onedeptid : 1177028662545973250
+ * eorc : 1
+ * currRoleId : supervisor
+ * caseid : 202105210004
+ * casetypeCode : 01
+ * nodeLimittime : 2021-05-29 17:22:56
+ * sourceName : 终端-普通上报
+ * reportTime : 2021-05-21 09:44:35
+ * onedeptName : 桥南中队
+ */
+
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
new file mode 100644
index 0000000..8e7626d
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java
@@ -0,0 +1,347 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageTodoBean {
+
+ private int code;
+ private DataBean data;
+ private String message;
+ private boolean success;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public static class DataBean {
+
+ private int total;
+ private List rows;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int isPostpone;
+ private int preState;
+ private String description;
+ private int source;
+ private String eorcName;
+ private String casetypeDetailName;
+ private String remainingTime;
+ private String casetypeName;
+ private String currUserId;
+ private String currUserName;
+ private String processId;
+ private int caseState;
+ private String id;
+ private String shopId;
+ private String fieldintro;
+ private String lat;
+ private String caseStateName;
+ private String preOperator;
+ private String lng;
+ private String isOvertime;
+ private String currRoleName;
+ private String casetypeDetailCode;
+ private String onedeptid;
+ private String eorc;
+ private String currRoleId;
+ private String caseid;
+ private String casetypeCode;
+ private String nodeLimittime;
+ private String sourceName;
+ private String reportTime;
+ private String onedeptName;
+
+ public int getIsPostpone() {
+ return isPostpone;
+ }
+
+ public void setIsPostpone(int isPostpone) {
+ this.isPostpone = isPostpone;
+ }
+
+ public int getPreState() {
+ return preState;
+ }
+
+ public void setPreState(int preState) {
+ this.preState = preState;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getSource() {
+ return source;
+ }
+
+ public void setSource(int source) {
+ this.source = source;
+ }
+
+ public String getEorcName() {
+ return eorcName;
+ }
+
+ public void setEorcName(String eorcName) {
+ this.eorcName = eorcName;
+ }
+
+ public String getCasetypeDetailName() {
+ return casetypeDetailName;
+ }
+
+ public void setCasetypeDetailName(String casetypeDetailName) {
+ this.casetypeDetailName = casetypeDetailName;
+ }
+
+ public String getRemainingTime() {
+ return remainingTime;
+ }
+
+ public void setRemainingTime(String remainingTime) {
+ this.remainingTime = remainingTime;
+ }
+
+ public String getCasetypeName() {
+ return casetypeName;
+ }
+
+ public void setCasetypeName(String casetypeName) {
+ this.casetypeName = casetypeName;
+ }
+
+ public String getCurrUserId() {
+ return currUserId;
+ }
+
+ public void setCurrUserId(String currUserId) {
+ this.currUserId = currUserId;
+ }
+
+ public String getCurrUserName() {
+ return currUserName;
+ }
+
+ public void setCurrUserName(String currUserName) {
+ this.currUserName = currUserName;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public int getCaseState() {
+ return caseState;
+ }
+
+ public void setCaseState(int caseState) {
+ this.caseState = caseState;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getFieldintro() {
+ return fieldintro;
+ }
+
+ public void setFieldintro(String fieldintro) {
+ this.fieldintro = fieldintro;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public String getCaseStateName() {
+ return caseStateName;
+ }
+
+ public void setCaseStateName(String caseStateName) {
+ this.caseStateName = caseStateName;
+ }
+
+ public String getPreOperator() {
+ return preOperator;
+ }
+
+ public void setPreOperator(String preOperator) {
+ this.preOperator = preOperator;
+ }
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getIsOvertime() {
+ return isOvertime;
+ }
+
+ public void setIsOvertime(String isOvertime) {
+ this.isOvertime = isOvertime;
+ }
+
+ public String getCurrRoleName() {
+ return currRoleName;
+ }
+
+ public void setCurrRoleName(String currRoleName) {
+ this.currRoleName = currRoleName;
+ }
+
+ public String getCasetypeDetailCode() {
+ return casetypeDetailCode;
+ }
+
+ public void setCasetypeDetailCode(String casetypeDetailCode) {
+ this.casetypeDetailCode = casetypeDetailCode;
+ }
+
+ public String getOnedeptid() {
+ return onedeptid;
+ }
+
+ public void setOnedeptid(String onedeptid) {
+ this.onedeptid = onedeptid;
+ }
+
+ public String getEorc() {
+ return eorc;
+ }
+
+ public void setEorc(String eorc) {
+ this.eorc = eorc;
+ }
+
+ public String getCurrRoleId() {
+ return currRoleId;
+ }
+
+ public void setCurrRoleId(String currRoleId) {
+ this.currRoleId = currRoleId;
+ }
+
+ public String getCaseid() {
+ return caseid;
+ }
+
+ public void setCaseid(String caseid) {
+ this.caseid = caseid;
+ }
+
+ public String getCasetypeCode() {
+ return casetypeCode;
+ }
+
+ public void setCasetypeCode(String casetypeCode) {
+ this.casetypeCode = casetypeCode;
+ }
+
+ public String getNodeLimittime() {
+ return nodeLimittime;
+ }
+
+ public void setNodeLimittime(String nodeLimittime) {
+ this.nodeLimittime = nodeLimittime;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public String getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(String reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public String getOnedeptName() {
+ return onedeptName;
+ }
+
+ public void setOnedeptName(String onedeptName) {
+ this.onedeptName = onedeptName;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
index f91fb83..b239323 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java
@@ -26,9 +26,9 @@
@Override
public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset);
+ registerTimeBegin, registerTimeEnd, isShopCase, offset);
return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
@Override
public void onCompleted() {
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
index 6e7121c..1facf53 100644
--- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
+++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java
@@ -5,5 +5,5 @@
public interface ICaseListModel {
Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
new file mode 100644
index 0000000..14e86fd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageHandledModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
new file mode 100644
index 0000000..a5d3513
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.model;
+
+import rx.Subscription;
+
+public interface IPackageTodoModel {
+ Subscription sendRetrofitRequest(int offset);
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
new file mode 100644
index 0000000..4806ed8
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageHandledBean;
+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 PackageHandledModelImpl implements IPackageHandledModel {
+
+ private OnGetHandledListListener listener;
+
+ public PackageHandledModelImpl(OnGetHandledListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetHandledListListener {
+ void onSuccess(PackageHandledBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getCompletedListResult(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(PackageHandledBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
new file mode 100644
index 0000000..6294ba2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java
@@ -0,0 +1,50 @@
+package com.casic.dcms.mvp.model;
+
+import com.casic.dcms.bean.PackageTodoBean;
+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 PackageTodoModelImpl implements IPackageTodoModel {
+
+ private OnGetTodoListListener listener;
+
+ public PackageTodoModelImpl(OnGetTodoListListener handledListListener) {
+ this.listener = handledListListener;
+ }
+
+ public interface OnGetTodoListListener {
+ void onSuccess(PackageTodoBean resultBean);
+
+ void onFailure(Throwable throwable);
+ }
+
+ @Override
+ public Subscription sendRetrofitRequest(int offset) {
+ Observable observable = RetrofitServiceManager.getWorkListResult(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(PackageTodoBean resultBean) {
+ if (resultBean != null) {
+ listener.onSuccess(resultBean);
+ }
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
index bddfa10..f87f72d 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java
@@ -18,10 +18,10 @@
@Override
public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset) {
+ String isShopCase, int offset) {
view.showProgress();
addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState,
- registerTimeBegin, registerTimeEnd, offset));
+ registerTimeBegin, registerTimeEnd, isShopCase, offset));
}
@Override
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
index 63f675f..e5c6755 100644
--- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java
@@ -3,7 +3,7 @@
public interface ICaseListPresenter {
void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode,
String caseState, String registerTimeBegin, String registerTimeEnd,
- int offset);
+ String isShopCase, int offset);
void disposeRetrofitRequest();
}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
new file mode 100644
index 0000000..a9bf3cd
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageHandledPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
new file mode 100644
index 0000000..282542c
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.presenter;
+
+public interface IPackageTodoPresenter {
+ void onReadyRetrofitRequest(int offset);
+
+ void disposeRetrofitRequest();
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
new file mode 100644
index 0000000..8bb8c03
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java
@@ -0,0 +1,37 @@
+package com.casic.dcms.mvp.presenter;
+
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.mvp.BasePresenter;
+import com.casic.dcms.mvp.model.PackageHandledModelImpl;
+import com.casic.dcms.mvp.view.IPackageHandledView;
+
+public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener {
+
+ private IPackageHandledView view;
+ private PackageHandledModelImpl actionModel;
+
+ public PackageHandledPresenterImpl(IPackageHandledView handledView) {
+ this.view = handledView;
+ actionModel = new PackageHandledModelImpl(this);
+ }
+
+ @Override
+ public void onReadyRetrofitRequest(int offset) {
+ addSubscription(actionModel.sendRetrofitRequest(offset));
+ }
+
+ @Override
+ public void disposeRetrofitRequest() {
+ unSubscription();
+ }
+
+ @Override
+ public void onSuccess(PackageHandledBean resultBean) {
+ view.obtainPackageHandledResult(resultBean);
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java
new file mode 100644
index 0000000..90014f2
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java
@@ -0,0 +1,37 @@
+package com.casic.dcms.mvp.presenter;
+
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.mvp.BasePresenter;
+import com.casic.dcms.mvp.model.PackageTodoModelImpl;
+import com.casic.dcms.mvp.view.IPackageTodoView;
+
+public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener {
+
+ private IPackageTodoView view;
+ private PackageTodoModelImpl actionModel;
+
+ public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) {
+ this.view = packageTodoView;
+ actionModel = new PackageTodoModelImpl(this);
+ }
+
+ @Override
+ public void onReadyRetrofitRequest(int offset) {
+ addSubscription(actionModel.sendRetrofitRequest(offset));
+ }
+
+ @Override
+ public void disposeRetrofitRequest() {
+ unSubscription();
+ }
+
+ @Override
+ public void onSuccess(PackageTodoBean resultBean) {
+ view.obtainPackageTodoResult(resultBean);
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java
new file mode 100644
index 0000000..09c4283
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java
@@ -0,0 +1,7 @@
+package com.casic.dcms.mvp.view;
+
+import com.casic.dcms.bean.PackageHandledBean;
+
+public interface IPackageHandledView {
+ void obtainPackageHandledResult(PackageHandledBean resultBean);
+}
diff --git a/app/build.gradle b/app/build.gradle
index 4e8aa5b..cd98584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "com.casic.dcms"
minSdkVersion 21
targetSdkVersion 30
- versionCode 16
- versionName "v1.0.0.8"
+ versionCode 17
+ versionName "v1.0.0.9"
ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ea35aa..674567f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
new file mode 100644
index 0000000..d146412
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java
@@ -0,0 +1,161 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageHandledBean;
+import com.casic.dcms.utils.HttpRequestHelper;
+import com.casic.dcms.utils.StringHelper;
+import com.casic.dcms.utils.callback.IHttpRequestListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.ResponseBody;
+
+public class PackageHandledAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "PackageHandledAdapter";
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageHandledAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageHandledAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageHandledAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.setText("上报时间：" + rowsBean.getReportTime());
+ //获取商铺图标
+ HttpRequestHelper.doRequest("/shop/merchant/detail", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ /**
+ * {
+ * "code":200,
+ * "data":[],
+ * "message":"请求成功",
+ * "success":true
+ * }
+ *
+ * {
+ * "code":500,
+ * "data":"",
+ * "exceptionClazz":"",
+ * "message":"服务器异常",
+ * "success":false
+ * }
+ * */
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明请求失败了，用默认图
+ leftImageView.setBackgroundResource(R.drawable.ic_package_holder);
+ } else {
+ Log.d(TAG, "detail: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+
+ //获取商铺处罚记录
+ HttpRequestHelper.doRequest("/shop/punish/listByMerchant", rowsBean.getShopId(), new IHttpRequestListener() {
+ @Override
+ public void onSuccess(ResponseBody resultBean) {
+ try {
+ String string = resultBean.string();
+ JSONObject jsonObject = new JSONObject(string);
+ Object data = jsonObject.get("data");
+ if (data instanceof String) {
+ //如果data是字符串，说明没有处罚过
+
+ } else {
+ Log.d(TAG, "listByMerchant: " + data);
+ }
+ } catch (IOException | JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+
+ }
+ });
+ }
+ }
+
+ private OnItemClickListener clickListener;
+
+ public interface OnItemClickListener {
+ void onClick(int position);
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.clickListener = onItemClickListener;
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
new file mode 100644
index 0000000..4671a7a
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java
@@ -0,0 +1,86 @@
+package com.casic.dcms.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.casic.dcms.R;
+import com.casic.dcms.bean.PackageTodoBean;
+import com.casic.dcms.utils.StringHelper;
+
+import java.util.List;
+
+public class PackageTodoAdapter extends RecyclerView.Adapter {
+
+ private List dataBeans;
+ private LayoutInflater layoutInflater;
+
+ public PackageTodoAdapter(Context context, List dataRows) {
+ this.dataBeans = dataRows;
+ layoutInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false);
+ return new PackageTodoAdapter.ItemViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PackageTodoAdapter.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 ImageView leftImageView;
+ private TextView caseTitleView;
+ private TextView caseDateView;
+// private TextView caseTimeView;
+
+ ItemViewHolder(@NonNull View itemView) {
+ super(itemView);
+ leftImageView = itemView.findViewById(R.id.leftImageView);
+ caseTitleView = itemView.findViewById(R.id.caseTitleView);
+ caseDateView = itemView.findViewById(R.id.caseDateView);
+// caseTimeView = itemView.findViewById(R.id.caseTimeView);
+ }
+
+ @SuppressLint("SetTextI18n")
+ void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) {
+ caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription()));
+ caseDateView.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/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
new file mode 100644
index 0000000..eb011e1
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java
@@ -0,0 +1,381 @@
+package com.casic.dcms.bean;
+
+import java.util.List;
+
+public class PackageHandledBean {
+
+ 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