xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改16号提出的bug

Browse Source
This commit is contained in:
md 2021-08-16 13:02:22 +08:00
parent 6ba575d0cf
commit 428fdcf70b
8 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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"

4
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
View File

@ -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);

1
app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
View File

@ -95,6 +95,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
});
poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans);
poiTaskXrv.setAdapter(poiTaskAdapter);
poiTaskAdapter.notifyDataSetChanged();
}

2
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
View File

@ -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);

2
app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
View File

@ -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);
//取消上拉加载，刷新功能。

4
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java
View File

@ -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() {

6
app/src/main/res/layout/tas_explain_item.xml
View File

@ -25,6 +25,10 @@
app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"
app:layout_constraintLeft_toRightOf="@id/iv_tas_explain"
android:layout_marginLeft="10dp"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintBottom_toBottomOf="parent"
android:background="#C0BFBF"/>
</androidx.constraintlayout.widget.ConstraintLayout>

22
app/src/main/res/layout/task_prefecture_item.xml
View File

@ -1,38 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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:background="?android:attr/selectableItemBackground"
android:layout_height="100dp">
android:layout_height="100dp"
android:background="?android:attr/selectableItemBackground">
<TextView
android:id="@+id/tv_title"
style="@style/text_style_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_style_title"
android:text="标题"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_dest"
style="@style/text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标题"
style="@style/text_style"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_title"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
<TextView
android:id="@+id/tv_time"
style="@style/text_style_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="少时诵诗书所所"
android:layout_marginRight="15dp"
style="@style/text_style_time"
android:text="少时诵诗书所所"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#C0BFBF"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>