From 04cb9c51fc313b4f2e17b42c002fd5ad29a5ad14 Mon Sep 17 00:00:00 2001 From: md Date: Wed, 11 Aug 2021 19:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/adapter/PoiTaskAdapter.java | 16 +++-- .../navinfo/outdoor/bean/HasSubmitBean.java | 10 ++-- .../outdoor/fragment/HasSubmitFragment.java | 10 ++-- .../outdoor/fragment/PoiTaskFragment.java | 3 +- app/src/main/res/layout/has_sumit_item.xml | 58 ++++++++++++------- 5 files changed, 60 insertions(+), 37 deletions(-) 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 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 @@ - + android:layout_height="60dp" + android:layout_margin="10dp"> + + + - + android:layout_marginTop="15dp" + android:text="111111" + app:layout_constraintLeft_toLeftOf="@+id/tv_has_name" + app:layout_constraintTop_toBottomOf="@+id/tv_has_name" /> + + + + + + 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" /> \ No newline at end of file