修改16号提出的bug
This commit is contained in:
parent
6ba575d0cf
commit
428fdcf70b
@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
|||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
//ndkVersion '23.0.7123448'
|
ndkVersion '23.0.7123448'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.navinfo.outdoor"
|
applicationId "com.navinfo.outdoor"
|
||||||
|
@ -232,7 +232,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
|
|||||||
if (Constant.TASK_TYPE == -1) {//"全部", "poi", "充电站", "POI录像", "道路录像", "其他", "面状任务"
|
if (Constant.TASK_TYPE == -1) {//"全部", "poi", "充电站", "POI录像", "道路录像", "其他", "面状任务"
|
||||||
tvExclusive.setText("全部");
|
tvExclusive.setText("全部");
|
||||||
} else if (Constant.TASK_TYPE == 1) {
|
} else if (Constant.TASK_TYPE == 1) {
|
||||||
tvExclusive.setText("poi");
|
tvExclusive.setText("POI");
|
||||||
} else if (Constant.TASK_TYPE == 2) {
|
} else if (Constant.TASK_TYPE == 2) {
|
||||||
tvExclusive.setText("充电站");
|
tvExclusive.setText("充电站");
|
||||||
} else if (Constant.TASK_TYPE == 3) {
|
} else if (Constant.TASK_TYPE == 3) {
|
||||||
@ -387,7 +387,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
|
|||||||
6 "面状任务"
|
6 "面状任务"
|
||||||
*/
|
*/
|
||||||
case R.id.cl_exclusive:
|
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
|
@Override
|
||||||
public void onClick(String text, int index) {
|
public void onClick(String text, int index) {
|
||||||
tvExclusive.setText(text);
|
tvExclusive.setText(text);
|
||||||
|
@ -95,6 +95,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
|
|||||||
});
|
});
|
||||||
poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans);
|
poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans);
|
||||||
poiTaskXrv.setAdapter(poiTaskAdapter);
|
poiTaskXrv.setAdapter(poiTaskAdapter);
|
||||||
|
poiTaskAdapter.notifyDataSetChanged();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
|
|||||||
|
|
||||||
taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity()));
|
taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||||
//下划线
|
//下划线
|
||||||
taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
// taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
||||||
|
|
||||||
taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
||||||
taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
||||||
|
@ -61,7 +61,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
|
|||||||
mIvFindTask.setOnClickListener(this::onClick);
|
mIvFindTask.setOnClickListener(this::onClick);
|
||||||
taskRecycler = findViewById(R.id.task_recycler);
|
taskRecycler = findViewById(R.id.task_recycler);
|
||||||
taskRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
|
taskRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||||
taskRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
// taskRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
||||||
taskRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
taskRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
||||||
taskRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
taskRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
||||||
//取消上拉加载,刷新功能。
|
//取消上拉加载,刷新功能。
|
||||||
|
@ -53,7 +53,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli
|
|||||||
ivWithdraw.setOnClickListener(this);
|
ivWithdraw.setOnClickListener(this);
|
||||||
rxlWithdraw = (XRecyclerView) findViewById(R.id.rxl_withdraw);
|
rxlWithdraw = (XRecyclerView) findViewById(R.id.rxl_withdraw);
|
||||||
rxlWithdraw.setLayoutManager(new LinearLayoutManager(getActivity()));
|
rxlWithdraw.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||||
rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
|
||||||
rxlWithdraw.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
rxlWithdraw.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
||||||
rxlWithdraw.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
rxlWithdraw.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
||||||
//取消上拉加载,刷新功能。
|
//取消上拉加载,刷新功能。
|
||||||
@ -62,6 +62,8 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli
|
|||||||
withdrawalAdapter = new WithdrawalAdapter(getContext());
|
withdrawalAdapter = new WithdrawalAdapter(getContext());
|
||||||
rxlWithdraw.setAdapter(withdrawalAdapter);
|
rxlWithdraw.setAdapter(withdrawalAdapter);
|
||||||
rxlWithdraw.getDefaultFootView().setNoMoreHint("已全部加载完毕");
|
rxlWithdraw.getDefaultFootView().setNoMoreHint("已全部加载完毕");
|
||||||
|
//设置下划线
|
||||||
|
// rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
||||||
rxlWithdraw.setLoadingListener(new XRecyclerView.LoadingListener() {
|
rxlWithdraw.setLoadingListener(new XRecyclerView.LoadingListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onRefresh() {
|
public void onRefresh() {
|
||||||
|
@ -25,6 +25,10 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"
|
app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"
|
||||||
app:layout_constraintLeft_toRightOf="@id/iv_tas_explain"
|
app:layout_constraintLeft_toRightOf="@id/iv_tas_explain"
|
||||||
android:layout_marginLeft="10dp"/>
|
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>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -1,38 +1,44 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:layout_height="100dp"
|
||||||
android:layout_height="100dp">
|
android:background="?android:attr/selectableItemBackground">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_title"
|
android:id="@+id/tv_title"
|
||||||
|
style="@style/text_style_title"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/text_style_title"
|
|
||||||
android:text="标题"
|
android:text="标题"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_dest"
|
android:id="@+id/tv_dest"
|
||||||
|
style="@style/text_style"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="标题"
|
android:text="标题"
|
||||||
style="@style/text_style"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="@+id/tv_title"
|
app:layout_constraintStart_toStartOf="@+id/tv_title"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
|
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_time"
|
android:id="@+id/tv_time"
|
||||||
|
style="@style/text_style_time"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="少时诵诗书所所"
|
|
||||||
android:layout_marginRight="15dp"
|
android:layout_marginRight="15dp"
|
||||||
style="@style/text_style_time"
|
android:text="少时诵诗书所所"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
|
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/tv_title" />
|
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>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
x
Reference in New Issue
Block a user