diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
index f478385..c3e1fb9 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
@@ -40,8 +40,15 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
HasSubmitBean.BodyBean.ListBean listBean = listBeans.get(position);
holder.tvnName.setText(listBean.getName()+"");
holder.tvTime.setText(listBean.getCreateTime()+"");
- holder.tvMassage.setText(listBean.getAuditMsg()+"");
- holder.tvMany.setText(listBean.getAuditStatus()+"");
+ if (listBean.getAuditStatus()==0){
+ holder.tvAuditStatus.setText("审核通过");
+ }else if (listBean.getAuditStatus() == 1){
+ holder.tvAuditStatus.setText("审核未通过");
+ }else if (listBean.getAuditStatus() == -1){
+ holder.tvAuditStatus.setText("待审核");
+ }
+ holder.tvMassage.setText(listBean.getAuditMsg());
+ holder.tvMany.setText("￥0.0");
}
@Override
@@ -50,14 +57,15 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
}
public class ViewHolder extends RecyclerView.ViewHolder {
- TextView tvnName, tvTime, tvMany, tvMassage;
+ TextView tvnName, tvTime, tvMany, tvMassage ,tvAuditStatus;
public ViewHolder(@NonNull @NotNull View itemView) {
super(itemView);
tvnName = itemView.findViewById(R.id.tv_has_name);
tvTime = itemView.findViewById(R.id.tv_createTime);
- tvMany = itemView.findViewById(R.id.tv_auditStatus);
+ tvAuditStatus= itemView.findViewById(R.id.tv_auditStatus);
tvMassage = itemView.findViewById(R.id.tv_auditMsg);
+ tvMany = itemView.findViewById(R.id.tv_many);
}
}
}
diff --git a/app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java b/app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
index 559dfac..184e4fa 100644
--- a/app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
+++ b/app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
@@ -39,7 +39,7 @@ public class HasSubmitBean {
private Integer total;
private List<ListBean> list;
private Integer type;
- private Integer auditedCount;
+ private Integer auditingCount;
private Integer passCount;
private Integer notPassCount;
@@ -91,12 +91,12 @@ public class HasSubmitBean {
this.type = type;
}
- public Integer getAuditedCount() {
- return auditedCount;
+ public Integer getAuditingCount() {
+ return auditingCount;
}
- public void setAuditedCount(Integer auditedCount) {
- this.auditedCount = auditedCount;
+ public void setAuditingCount(Integer auditingCount) {
+ this.auditingCount = auditingCount;
}
public Integer getPassCount() {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
index 91f7d76..efc92ec 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
@@ -117,7 +117,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
- otherAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
+ otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
@@ -150,7 +150,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
- chargingAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
+ chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
@@ -183,7 +183,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
- roadAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
+ roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
@@ -216,7 +216,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
- poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
+ poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
@@ -249,7 +249,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
- auditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
+ auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
auditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
index e76a9e9..41b5c92 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
@@ -64,7 +64,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
tvTaskTitle.setText("充电站任务列表");
break;
case 3:
- tvTaskTitle.setText("POIVIDEO任务列表");
+ tvTaskTitle.setText("POI录像任务列表");
break;
case 4:
tvTaskTitle.setText("道路任务列表");
@@ -77,6 +77,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
ivPoiTaskFinish.setOnClickListener(this::onClick);
poiTaskXrv = (XRecyclerView) findViewById(R.id.poiTask_xrv);
poiTaskXrv.setLayoutManager(new LinearLayoutManager(getActivity()));
+ poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
poiTaskXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
poiTaskXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
diff --git a/app/src/main/res/layout/has_sumit_item.xml b/app/src/main/res/layout/has_sumit_item.xml
index 1626062..5069660 100644
--- a/app/src/main/res/layout/has_sumit_item.xml
+++ b/app/src/main/res/layout/has_sumit_item.xml
@@ -1,38 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tv_has_name"
- android:textStyle="bold"
- android:textColor="@color/black"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- android:text="11111111111"/>
+ android:layout_height="60dp"
+ android:layout_margin="10dp">
+
<TextView
+ android:id="@+id/tv_has_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="11111111111"
+ android:textColor="@color/black"
+ android:textStyle="bold"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
android:id="@+id/tv_createTime"
- app:layout_constraintTop_toBottomOf="@+id/tv_has_name"
- android:text="111111"
- app:layout_constraintLeft_toLeftOf="@+id/tv_has_name"/>
- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="@+id/tv_has_name"
- app:layout_constraintRight_toRightOf="parent"
- android:id="@+id/tv_auditStatus"
- android:text="1111"/>
+ android:layout_marginTop="15dp"
+ android:text="111111"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_has_name"
+ app:layout_constraintTop_toBottomOf="@+id/tv_has_name" />
+
<TextView
+ android:id="@+id/tv_many"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="￥0.0"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tv_has_name" />
+
+ <TextView
+ android:id="@+id/tv_auditStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2222"
- app:layout_constraintTop_toTopOf="@+id/tv_createTime"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tv_createTime" />
+
+ <TextView
android:id="@+id/tv_auditMsg"
- app:layout_constraintRight_toRightOf="parent"/>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="10dp"
+ android:text="2222"
+ app:layout_constraintRight_toLeftOf="@+id/tv_auditStatus"
+ app:layout_constraintTop_toTopOf="@+id/tv_createTime" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file