Merge branch 'M9_20221026'

This commit is contained in:
肖岩 2022-11-02 10:49:25 +08:00
commit 3da460c914
3 changed files with 5 additions and 5 deletions

View File

@ -12,8 +12,8 @@ android {
applicationId "com.navinfo.outdoor" applicationId "com.navinfo.outdoor"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 29 versionCode 30
versionName "8.221031" versionName "8.221102"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
lintOptions { lintOptions {

View File

@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface { public class HttpInterface {
// public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP // 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 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/test/m4";//测试接口-外网
public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的 public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录 public static final String USER_LOGIN_PATH = "/userlogin/";//登录

View File

@ -84,7 +84,7 @@ public class PoiSaveUtils {
} }
if (poiEntity.getType()==2) { if (poiEntity.getType()==2) {
chargePoiEntityList.add(poiEntity); chargePoiEntityList.add(poiEntity);
} if (poiEntity.getType() == 3 || poiEntity.getType() == 4) { } else if (poiEntity.getType() == 3 || poiEntity.getType() == 4) {
spliteFilePoiEntityList.add(poiEntity); spliteFilePoiEntityList.add(poiEntity);
} else { } else {
otherPoiEntityList.add(poiEntity); otherPoiEntityList.add(poiEntity);