From f08c816869a0b03d328ea6e30edade47621ca067 Mon Sep 17 00:00:00 2001
From: wds <wds811@126.com>
Date: Sun, 15 Aug 2021 16:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8C=E5=87=BB=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outdoor/fragment/PoiTaskFragment.java     |  8 ++++----
 .../outdoor/fragment/RecordFragment.java      |  2 --
 .../outdoor/fragment/TreasureFragment.java    | 20 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

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 2cd08ca..24e5f3a 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
@@ -1,5 +1,6 @@
 package com.navinfo.outdoor.fragment;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -79,11 +80,11 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
         poiTaskXrv.setLayoutManager(new LinearLayoutManager(getActivity()));
         poiTaskXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         poiTaskXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
-        poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+       //poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
         poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
-
+                page = 1;
                 initWork(type,true);
             }
 
@@ -94,7 +95,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
         });
         poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans);
         poiTaskXrv.setAdapter(poiTaskAdapter);
-        poiTaskXrv.getDefaultFootView().setNoMoreHint("已全部加载完毕");
+
     }
 
     @Override
@@ -125,7 +126,6 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
                             if (hasSubmitBean.getBody()!=null){
                                 initHasSubmitBean(hasSubmitBean,aBoolean);
                             }
-                            page++;
                         }else {
                             Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
                         }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java
index 275d50c..9119b65 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java
@@ -48,9 +48,7 @@ public class RecordFragment extends BaseFragment implements View.OnClickListener
         super.initView();
         tabRecord = (TabLayout) findViewById(R.id.tab_record);
         vpRecord = (NoSlideViewPager) findViewById(R.id.vp_record);
-
         ArrayList<Fragment> fragments = new ArrayList<>();
-        new StaySubmitFragment();
         staySubmitFragment = new StaySubmitFragment();
         fragments.add(staySubmitFragment);
         hasSubmitFragment = new HasSubmitFragment();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index 1278e31..7a00748 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -131,6 +131,15 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     private List<Removable> removableScreenMarker;
     private List<Removable> removablesLocality;
     private int treasurePage=1;
+    private Handler handler=new Handler(new Handler.Callback() {
+        @Override
+        public boolean handleMessage(@NonNull Message msg) {
+            if(msg.what==0x100){
+                isBack=false;
+            }
+            return false;
+        }
+    });
     /**
      * bitmapDescriptor1
      */
@@ -142,6 +151,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     private final int MARKER_LINE = 2;
     private final int MARKER_FACE = 1;
     private final int MARKER_BIG = 4;
+    private boolean isBack=false;
 
 
     public static TreasureFragment newInstance(Bundle bundle) {
@@ -1726,7 +1736,15 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
 
     @Override
     public boolean onBackPressed() {
-        getActivity().finish();
+        if (!isBack){
+            isBack = true;
+            Toast.makeText(getActivity(), "双击退出程序", Toast.LENGTH_SHORT).show();
+            handler.sendEmptyMessageDelayed(0x100,2000);
+        }else {
+            getActivity().finish();
+        }
+
+
         return true;
     }