yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_265_220329_2.6.5' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_265_220329_2.6.5

Browse Source
This commit is contained in:
wangmingjun
2022-03-30 16:16:22 +08:00
parent af9008a3aa 312258f203
commit a9da03e9de
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MapRoadInfo.kt
View File

@@ -11,7 +11,7 @@ class MapRoadInfo {
/**
* 车道ID
*/
var laneId: String = ""
var laneId: List<String>? = null
/**
* 停止线上的点
@@ -21,7 +21,7 @@ class MapRoadInfo {
/**
* 道路ID
*/
var roadId: String = ""
var roadId: List<String>? = null
/**
* 瓦片ID

2
gradle.properties
View File

@@ -82,7 +82,7 @@ MOGO_LOCATION_VERSION=1.3.50
MOGO_TELEMATIC_VERSION=1.3.50
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.0.9.6
MAP_SDK_VERSION=2.0.9.7
MAP_SDK_OPERATION_VERSION=1.0.12
# websocket
WEBSOCKET_VERSION=1.1.7

2
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -180,7 +180,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onStopLineInfo(@androidx.annotation.Nullable StopLine stopLine) {
MogoLocation carLoc = CallerMapLocationListenerManager.INSTANCE.getCurrentLocation();
if (stopLine != null && !TextUtils.isEmpty(stopLine.road_id) && stopLine.points != null && stopLine.points.size() > 0) {
if (stopLine != null && stopLine.road_id != null && !stopLine.road_id.isEmpty() && stopLine.points != null && stopLine.points.size() > 0) {
ArrayList<LonLatPoint> points = stopLine.points;
if (carLoc != null) {
/**