diff --git a/app/build.gradle b/app/build.gradle index 7a679c7..ac65e7e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 39 - versionName "8.221216" + versionCode 40 + versionName "8.221219" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java index 93d0966..def47f4 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -1363,10 +1363,10 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic .subscribe(new Consumer() { @Override public void accept(PoiEntity poiEntity) { - // 已经处理过该任务,将其从finish列表中移除 - if (poiEntity!=null) { - finishEntityMap.remove(poiEntity.getTaskId()); - } +// // 已经处理过该任务,将其从finish列表中移除 +// if (poiEntity!=null) { +// finishEntityMap.remove(poiEntity.getTaskId()); +// } } }, new Consumer() { @Override @@ -1382,7 +1382,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic public void run() throws Exception { // 重新绘制网络任务和本地任务 initRoadLine2Map(); - finishEntityMap.clear(); +// finishEntityMap.clear(); hasFinishTask = 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 720779c..e73822a 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 IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 + public static final String IP = "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/";//登录