xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan-5800X 2022-12-22 00:09:30 +08:00
commit 7fb65d4a64
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
View File

@ -1355,10 +1355,10 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
.subscribe(new Consumer<PoiEntity>() {
@Override
public void accept(PoiEntity poiEntity) {
// 已经处理过该任务，将其从finish列表中移除
if (poiEntity!=null) {
finishEntityMap.remove(poiEntity.getTaskId());
}
// // 已经处理过该任务，将其从finish列表中移除
// if (poiEntity!=null) {
// finishEntityMap.remove(poiEntity.getTaskId());
// }
}
}, new Consumer<Throwable>() {
@Override
@ -1374,7 +1374,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
public void run() throws Exception {
// 重新绘制网络任务和本地任务
initRoadLine2Map();
finishEntityMap.clear();
// finishEntityMap.clear();
hasFinishTask = false;
}
});

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -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/";//登录