修改领取范围

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"

app/src/main/java/com/navinfo/outdoor/api/UserApplication.java

@@ -79,11 +79,11 @@ public class UserApplication extends Application {
         //builder.cookieJar(new CookieJarImpl(new MemoryCookieStore()));
         //超时时间设置，默认60秒
         //全局的读取超时时间
-        builder.readTimeout(5000, TimeUnit.MILLISECONDS);
+        builder.readTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
         //全局的写入超时时间
-        builder.writeTimeout(5000, TimeUnit.MILLISECONDS);
+        builder.writeTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
         //全局的连接超时时间
-        builder.connectTimeout(5000, TimeUnit.MILLISECONDS);
+        builder.connectTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
         OkGo.getInstance().init(this)
                 .setOkHttpClient(builder.build())
                 //全局统一缓存模式，默认不使用缓存，可以不传

app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java

@@ -307,7 +307,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 break;
 
             case R.id.btn_poi_video_upload:
-                showLoadingDialog();
+                showFileLoadingDialog();
                 ArrayList<File> fileList = new ArrayList<>();
                 if (fmPoiVideoPic.getTag() != null) {
                     List<File> videoFileList = (List<File>) fmPoiVideoPic.getTag();

app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java

@@ -72,6 +72,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
+import okhttp3.OkHttpClient;
+
 /**
  * 寻宝-点击上传弹窗-道路
  */
@@ -316,7 +318,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 startActivityForResult(intent, 0x101);
                 break;
             case R.id.road_upload:
-                showLoadingDialog();
+                showFileLoadingDialog();
+                setLoadingDialogText("压缩中。。");
                 ArrayList<File> fileList = new ArrayList<>();
                 if (fmRoadPic.getTag() != null) {
                     List<File> videoFileList = (List<File>) fmRoadPic.getTag();
@@ -348,10 +351,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                         }
                     }).start();
                 }else {
+                    dismissLoadingDialog();
                     Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show();
                     return;
                 }
-
                 break;
 
         }
@@ -509,6 +512,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             return;
         }
         showFileLoadingDialog();
+        setLoadingDialogText("上传中。。");
         OkGo
                 // 请求方式和请求url
                 .<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)

app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java

@@ -220,7 +220,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                     }
                 }
                 if (poiEntities.size() > 0) {
-                    showLoadingDialog();
+                    showFileLoadingDialog();
                     PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities);
                 } else {
                     Toast.makeText(getContext(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show();

app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java

@@ -47,7 +47,7 @@ public class PoiSaveUtils {
     private Gson gson;
     private static PoiSaveUtils instance;
     private int anInt=0;
-    private int bInt=1;
+    private int bInt=0;
 
     public static PoiSaveUtils getInstance(Activity mContext) {
         if (instance == null) {

app/src/main/res/layout/loading.xml

@@ -17,7 +17,8 @@
 
     <TextView
         android:id="@+id/progressBar_tx"
-        android:layout_width="50dp"
+        android:layout_width="100dp"
+        android:gravity="center"
         android:layout_height="wrap_content"
         android:layout_below="@+id/progressBar1"
         android:layout_centerHorizontal="true"