From c8949b6b02725f9597384f8f3261a0d7e89208af Mon Sep 17 00:00:00 2001 From: wds Date: Thu, 5 Aug 2021 15:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=86=E5=8F=96=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../java/com/navinfo/outdoor/api/UserApplication.java | 6 +++--- .../com/navinfo/outdoor/fragment/PoiVideoFragment.java | 2 +- .../java/com/navinfo/outdoor/fragment/RoadFragment.java | 8 ++++++-- .../com/navinfo/outdoor/fragment/StaySubmitFragment.java | 2 +- .../main/java/com/navinfo/outdoor/util/PoiSaveUtils.java | 2 +- app/src/main/res/layout/loading.xml | 3 ++- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 43917f5..66355d9 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/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index d420888..65b9b62 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/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()) //全局统一缓存模式，默认不使用缓存，可以不传 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 594c9b7..0a3c226 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/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 fileList = new ArrayList<>(); if (fmPoiVideoPic.getTag() != null) { List videoFileList = (List) fmPoiVideoPic.getTag(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index c94e242..3d6627f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/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 fileList = new ArrayList<>(); if (fmRoadPic.getTag() != null) { List videoFileList = (List) 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 .post(HttpInterface.ROAD_TASK_UPLOAD_PIC) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index 1b04ca7..e2a9a0b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/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(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index 8e0975d..2969cd6 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/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) { diff --git a/app/src/main/res/layout/loading.xml b/app/src/main/res/layout/loading.xml index 82ff298..4b7e74f 100644 --- a/app/src/main/res/layout/loading.xml +++ b/app/src/main/res/layout/loading.xml @@ -17,7 +17,8 @@