diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 16002fb..5a34468 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c6af3d7..6a52938 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
minSdkVersion 23
targetSdkVersion 30
versionCode 29
- versionName "8.221028"
+ versionName "8.221031"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
@@ -86,7 +86,7 @@ dependencies {
implementation 'com.lzy.net:okgo:3.0.4'
implementation 'com.lzy.net:okrx2:2.0.2'
implementation 'com.google.code.gson:gson:2.8.5'
- implementation 'com.readystatesoftware.chuck:library:1.0.4'
+ implementation 'com.readystatesoftware.chuck:library:1.1.0'
//retrofit+rxJava
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
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 038be98..ff070fa 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -500,77 +500,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
break;
case R.id.btn_poi_video_upload:
poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了上传的按钮 ,");
- if (Constant.isPresent) {
- if (fmPoiVideoPic.getTag() != null) {
- List videoFileList = (List) fmPoiVideoPic.getTag();
- boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList);
- if (!existsPic) {
- ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！");
- return;
- }
- DataSaveUtils.getInstance().uploadFiles(getActivity(), showPoiEntity, videoFileList, new DataSaveUtils.UploadCallback() {
- @Override
- public void onStart() {
- dismissLoadingDialog();
- Constant.isPresent = false;
- getActivity().getSupportFragmentManager().popBackStack();//回退
- WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
- WaitDialog.dismiss(3000);
- }
-
- @Override
- public void onFinish() {
- Constant.isPresent = true;
- }
-
- @Override
- public void onError() {
-
- }
- });
-// fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// ZipUtil.zipFiles(videoFileList, fileZip, null);
-// long zipTrueSize = ZipUtils.getZipTrueSize(fileZip.getAbsolutePath());
-// if (zipTrueSize > 0) {
-// if (getActivity() != null) {
-// getActivity().runOnUiThread(new Runnable() {
-// @Override
-// public void run() {
-// if (showPoiEntity == null) {
-// showPoiEntity = new PoiEntity();
-// }
-// if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 2 || showPoiEntity.getTaskStatus() == 5) {
-// initPoiSaveLocal(true);
-// } else {
-// poiVideoUpload(showPoiEntity.getBodyId(), fileZip);
-// Constant.isPresent = false;
-// }
-// }
-// });
-// }
-// } else {
-// if (getActivity() != null) {
-// getActivity().runOnUiThread(new Runnable() {
-// @Override
-// public void run() {
-// fileZip.delete();
-// ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交");
-// }
-// });
-// }
-// }
-// }
-// }).start();
- } else {
- dismissLoadingDialog();
- ToastUtils.Message(getActivity(), "请录像");
- return;
- }
+ PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
+ if (poiEntity.getTaskStatus() == 1 || poiEntity.getTaskStatus() == 2 || poiEntity.getTaskStatus() == 0 || poiEntity.getTaskStatus() == 5) {
+ initPoiSaveLocal(true);
} else {
- ToastUtils.Message(getActivity(), "该任务正在提交中");
+ poiVideoUpload(poiEntity);
+ Constant.isPresent = false;
}
break;
}
@@ -652,32 +587,46 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
- private void poiVideoUpload(int poiVideoBody, File fileZip) {
- if (poiVideoBody == 0) {
+ private void poiVideoUpload(PoiEntity poiEntity) {
+ if (poiEntity.getBodyId() == 0) {
ToastUtils.Message(getActivity(), "请先保存本地在上传");
return;
}
- if (fileZip == null) {
- ToastUtils.Message(getActivity(), "未压缩完成");
- return;
- }
- HttpParams httpParams = new HttpParams();
- httpParams.put("auditId", poiVideoBody);
- long time = System.currentTimeMillis();
- httpParams.put("datetime", time);
- httpParams.put("file", fileZip);
- OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
- .time(0)
- .Builder(getActivity())
- .url(HttpInterface.POI_VIDEO_UPLOAD_PIC)
- .cls(OtherUploadPicBean.class)
- .params(httpParams)
- .token(Constant.ACCESS_TOKEN);
- if (getActivity() != null) {
- okGoBuilder.postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(), showPoiEntity, fileZip));
- getActivity().getSupportFragmentManager().popBackStack();//回退
- WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
- WaitDialog.dismiss(3000);
+ if (Constant.isPresent) {
+ if (fmPoiVideoPic.getTag() != null) {
+ List videoFileList = (List) fmPoiVideoPic.getTag();
+ boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList);
+ if (!existsPic) {
+ ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！");
+ return;
+ }
+ DataSaveUtils.getInstance().uploadFiles(getActivity(), showPoiEntity, videoFileList, new DataSaveUtils.UploadCallback() {
+ @Override
+ public void onStart() {
+ dismissLoadingDialog();
+ Constant.isPresent = false;
+ getActivity().getSupportFragmentManager().popBackStack();//回退
+ WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+ WaitDialog.dismiss(3000);
+ }
+
+ @Override
+ public void onFinish() {
+ Constant.isPresent = true;
+ }
+
+ @Override
+ public void onError() {
+
+ }
+ });
+ } else {
+ dismissLoadingDialog();
+ ToastUtils.Message(getActivity(), "请录像拍照");
+ return;
+ }
+ } else {
+ ToastUtils.Message(getActivity(), "该任务正在提交中");
}
}
@@ -713,7 +662,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
- poiVideoUpload(poiVideoBody, fileZip);
+ poiVideoUpload(poiEntity);
Constant.isPresent = false;
}
});
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 f9d1f12..b29b987 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -576,79 +576,16 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
startActivityForResult(intent, 0x101);
break;
case R.id.road_upload:
+ // 如果该数据没有被保存，需要先调用保存功能自动保存数据
roadBuilder.append(TimestampUtil.time()).append(",").append("点击了上传的按钮 ,");
- if (Constant.isPresent) {
- if (fmRoadPic.getTag() != null) {
- List videoFileList = (List) fmRoadPic.getTag();
- boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList);
- if (!existsPic) {
- ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！");
- return;
- }
- DataSaveUtils.getInstance().uploadFiles(getActivity(), showPoiEntity, videoFileList, new DataSaveUtils.UploadCallback() {
- @Override
- public void onStart() {
- dismissLoadingDialog();
- Constant.isPresent = false;
- getActivity().getSupportFragmentManager().popBackStack();//回退
- WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
- WaitDialog.dismiss(3000);
- }
-
- @Override
- public void onFinish() {
- Constant.isPresent = true;
- }
-
- @Override
- public void onError() {
-
- }
- });
-// fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// ZipUtil.zipFiles(videoFileList, fileZip, null);//压缩
-// long zipTrueSize = ZipUtils.getZipTrueSize(fileZip.getAbsolutePath());
-// if (zipTrueSize > 0) {
-// if (getActivity() != null) {
-// getActivity().runOnUiThread(new Runnable() {
-// @Override
-// public void run() {
-// if (showPoiEntity == null) {
-// showPoiEntity = new PoiEntity();
-// }
-// if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 2 || showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 5) {
-// initPoiSaveLocal(true);
-// } else {
-// poiVideoUpload(showPoiEntity.getBodyId(), fileZip);
-// Constant.isPresent = false;
-// }
-// }
-// });
-// }
-// } else {
-// if (getActivity() != null) {
-// getActivity().runOnUiThread(new Runnable() {
-// @Override
-// public void run() {
-// fileZip.delete();
-// ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交");
-// }
-// });
-// }
-// }
-// }
-// }).start();
- } else {
- dismissLoadingDialog();
- ToastUtils.Message(getActivity(), "请录像");
- return;
- }
+ PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
+ if (poiEntity.getTaskStatus() == 1 || poiEntity.getTaskStatus() == 2 || poiEntity.getTaskStatus() == 0 || poiEntity.getTaskStatus() == 5) {
+ initPoiSaveLocal(true);
} else {
- ToastUtils.Message(getActivity(), "该任务正在提交中");
+ poiVideoUpload(poiEntity);
+ Constant.isPresent = false;
}
+
break;
}
}
@@ -729,32 +666,46 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}
}
- private void poiVideoUpload(int body, File fileZip) {
- if (body == 0) {
- ToastUtils.Message(getActivity(), "请先保存本地上传");
+ private void poiVideoUpload(PoiEntity poiEntity) {
+ if (poiEntity.getBodyId() == 0) {
+ ToastUtils.Message(getActivity(), "请先保存本地在上传");
return;
}
- if (fileZip == null) {
- ToastUtils.Message(getActivity(), "未压缩完成");
- return;
- }
- HttpParams httpParams = new HttpParams();
- httpParams.put("auditId", body);
- long time = System.currentTimeMillis();
- httpParams.put("datetime", time);
- httpParams.put("file", fileZip);
- OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
- .time(0)
- .Builder(getActivity())
- .url(HttpInterface.ROAD_TASK_UPLOAD_PIC)
- .cls(OtherUploadPicBean.class)
- .params(httpParams)
- .token(Constant.ACCESS_TOKEN);
- if (getActivity() != null) {
- okGoBuilder.postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity, fileZip));
- getActivity().getSupportFragmentManager().popBackStack();//回退
- WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
- WaitDialog.dismiss(3000);
+ if (Constant.isPresent) {
+ if (fmRoadPic.getTag() != null) {
+ List videoFileList = (List) fmRoadPic.getTag();
+ boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList);
+ if (!existsPic) {
+ ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！");
+ return;
+ }
+ DataSaveUtils.getInstance().uploadFiles(getActivity(), poiEntity, videoFileList, new DataSaveUtils.UploadCallback() {
+ @Override
+ public void onStart() {
+ dismissLoadingDialog();
+ Constant.isPresent = false;
+ getActivity().getSupportFragmentManager().popBackStack();//回退
+ WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+ WaitDialog.dismiss(3000);
+ }
+
+ @Override
+ public void onFinish() {
+ Constant.isPresent = true;
+ }
+
+ @Override
+ public void onError() {
+
+ }
+ });
+ } else {
+ dismissLoadingDialog();
+ ToastUtils.Message(getActivity(), "请录像拍照");
+ return;
+ }
+ } else {
+ ToastUtils.Message(getActivity(), "该任务正在提交中");
}
}
@@ -794,7 +745,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
- poiVideoUpload(roadBody, fileZip);
+ poiVideoUpload(poiEntity);
Constant.isPresent = false;
}
});
diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
index 1b7a69a..720779c 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface {
// public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP
public static final String IPm = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
- public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
- public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
+ public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
+ public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录
diff --git a/build.gradle b/build.gradle
index 912a369..586dc7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,6 @@ buildscript {
ext.anko_version = '0.10.1'//扩展库版本
ext.kotlin_version = '1.5.10'
repositories {
- google()
- jcenter()
- mavenCentral()
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
//友盟 检测bug
maven { url 'https://repo1.maven.org/maven2/' }
@@ -14,9 +11,9 @@ buildscript {
url "https://oss.sonatype.org/content/groups/public"
}
maven { url "https://jitpack.io" }
-
-
-
+ google()
+ jcenter()
+ mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.0"
@@ -30,12 +27,16 @@ buildscript {
allprojects {
repositories {
- jcenter()
- google()
- mavenCentral()
maven { url 'https://jitpack.io' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://repo1.maven.org/maven2/' }
+ //腾讯地图
+ maven{
+ url "https://oss.sonatype.org/content/groups/public"
+ }
+ jcenter()
+ google()
+ mavenCentral()
}
}
diff --git a/gradle.properties b/gradle.properties
index e11d5da..df295b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,9 +16,9 @@ org.gradle.jvmargs=-Xmx2048m
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
systemProp.http.proxyHost=127.0.0.1
-systemProp.http.proxyPort=1080
+systemProp.http.proxyPort=10080
systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=1080
+systemProp.https.proxyPort=10080
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.injected.testOnly=false