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

Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map

Browse Source
This commit is contained in:
董宏宇
2020-10-28 19:42:48 +08:00
parent 4be2da2818 7d61298107
commit 22301a4d6f
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
View File

@@ -155,6 +155,6 @@ class AdasRecognizedResultDrawer {
.owner( DataTypes.TYPE_MARKER_ADAS )
.icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.module_common_online_car_vr_middle ) )
.position( new MogoLatLng( recognizedListResult.latLonList.get( 0 ).lat, recognizedListResult.latLonList.get( 0 ).lon ) );
return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options );
return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( DataTypes.TYPE_MARKER_ADAS, options );
}
}

3
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
View File

@@ -70,6 +70,7 @@ class SnapshotSetDataDrawer {
*/
public void renderSnapshotData( MogoSnapshotSetData data, boolean filterAdasData ) {
if ( data == null || data.getAllList() == null || data.getAllList().isEmpty() ) {
MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers( DataTypes.TYPE_MARKER_CLOUD_DATA );
return;
}
purgeCloudSnapshotData( data );
@@ -162,6 +163,6 @@ class SnapshotSetDataDrawer {
.owner( DataTypes.TYPE_MARKER_CLOUD_DATA )
.icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.module_common_online_car_vr_middle ) )
.position( new MogoLatLng( data.getLat(), data.getLon() ) );
return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options );
return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( DataTypes.TYPE_MARKER_CLOUD_DATA, options );
}
}

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java
View File

@@ -101,7 +101,7 @@ public class CloudRoadData implements Parcelable {
}
public double getDistance() {
return distance;
return distance * 1000;
}
public void setDistance(double distance) {

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -156,7 +156,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
if ( data == null ) {
return;
}
SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, true );
SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, false );
VrModeController.getInstance().renderMogoSnapshotSetData( data );
}