From 428fdcf70ba88808b9e9bd9e673f62ef71eac4ae Mon Sep 17 00:00:00 2001 From: md Date: Mon, 16 Aug 2021 13:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B916=E5=8F=B7=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/fragment/FilterFragment.java | 4 ++-- .../outdoor/fragment/PoiTaskFragment.java | 1 + .../outdoor/fragment/TaskExplainFragment.java | 2 +- .../fragment/TaskPrefectureFragment.java | 2 +- .../fragment/WithdrawalRecordFragment.java | 4 +++- app/src/main/res/layout/tas_explain_item.xml | 6 ++++- .../main/res/layout/task_prefecture_item.xml | 22 ++++++++++++------- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 81cf51b..5e04152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - //ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index c1fb665..1e781e3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -232,7 +232,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi if (Constant.TASK_TYPE == -1) {//"全部", "poi", "充电站", "POI录像", "道路录像", "其他", "面状任务" tvExclusive.setText("全部"); } else if (Constant.TASK_TYPE == 1) { - tvExclusive.setText("poi"); + tvExclusive.setText("POI"); } else if (Constant.TASK_TYPE == 2) { tvExclusive.setText("充电站"); } else if (Constant.TASK_TYPE == 3) { @@ -387,7 +387,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi 6 "面状任务" */ case R.id.cl_exclusive: - BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "poi", "充电站", "POI录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() { + BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "POI", "充电站", "POI录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() { @Override public void onClick(String text, int index) { tvExclusive.setText(text); 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 928c90a..1a18243 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -95,6 +95,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene }); poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans); poiTaskXrv.setAdapter(poiTaskAdapter); + poiTaskAdapter.notifyDataSetChanged(); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index ce72bfd..fea1229 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -61,7 +61,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity())); //下划线 - taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + // taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index cfc0e78..5054740 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -61,7 +61,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick mIvFindTask.setOnClickListener(this::onClick); taskRecycler = findViewById(R.id.task_recycler); taskRecycler.setLayoutManager(new LinearLayoutManager(getActivity())); - taskRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + // taskRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); taskRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能。 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java index b463745..ee680a6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -53,7 +53,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli ivWithdraw.setOnClickListener(this); rxlWithdraw = (XRecyclerView) findViewById(R.id.rxl_withdraw); rxlWithdraw.setLayoutManager(new LinearLayoutManager(getActivity())); - rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + rxlWithdraw.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); rxlWithdraw.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能。 @@ -62,6 +62,8 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli withdrawalAdapter = new WithdrawalAdapter(getContext()); rxlWithdraw.setAdapter(withdrawalAdapter); rxlWithdraw.getDefaultFootView().setNoMoreHint("已全部加载完毕"); + //设置下划线 + // rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); rxlWithdraw.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { diff --git a/app/src/main/res/layout/tas_explain_item.xml b/app/src/main/res/layout/tas_explain_item.xml index 11a95c4..95561be 100644 --- a/app/src/main/res/layout/tas_explain_item.xml +++ b/app/src/main/res/layout/tas_explain_item.xml @@ -25,6 +25,10 @@ app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain" app:layout_constraintLeft_toRightOf="@id/iv_tas_explain" android:layout_marginLeft="10dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/layout/task_prefecture_item.xml b/app/src/main/res/layout/task_prefecture_item.xml index 38d95a7..3797787 100644 --- a/app/src/main/res/layout/task_prefecture_item.xml +++ b/app/src/main/res/layout/task_prefecture_item.xml @@ -1,38 +1,44 @@ - + android:layout_height="100dp" + android:background="?android:attr/selectableItemBackground"> + + + \ No newline at end of file