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

fix: 合并冲突

Browse Source
This commit is contained in:
xiaoyan
2023-01-29 18:14:44 +08:00
parent c4d927d40b 61d369b97c
commit 43960c0740
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -13,7 +13,7 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 43 versionCode 43
versionName "8.230113" versionName "8.230130"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {

4
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@@ -890,8 +890,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
} }
} }
} }
String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID); // String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID);
poiEntity.setPhoto(photoStr); poiEntity.setPhoto(fileListByUUID.size()+"");
} }
} }

4
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@@ -990,8 +990,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
} }
} }
String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID); // String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID);
poiEntity.setPhoto(photoStr); poiEntity.setPhoto(fileListByUUID.size()+"");
} }
} }
return poiEntity; return poiEntity;

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

@@ -2,9 +2,9 @@ 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 IP1 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
public static final String IP3 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP1 = "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/";//登录