diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 04955bd309..67376f59f2 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.0.8' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.0.9' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 7416748d61..8b4ee7e0f1 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -788,6 +788,7 @@ public class AMapViewWrapper implements IMogoMapView, mSpeedView.setLayoutParams( new ViewGroup.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT ) ); } mSpeedView.setText( String.valueOf( ( ( int ) ( speed * 3.6 ) ) ) ); + mSelfMarker.setInfoWindowOffset( 0, 20 ); mSelfMarker.setInfoWindowView( mSpeedView ); } else { mSelfMarker.hideInfoWindow(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 5250465a76..295aa0f3b1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -64,6 +64,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer { // adas marker 缓存 private Map< String, IMogoMarker > mAdasRecognizedMarkersCaches = new ConcurrentHashMap<>(); + public boolean hasCached( String uniqueKey ) { + return mAdasRecognizedMarkersCaches.containsKey( uniqueKey ); + } + public void renderAdasRecognizedResult( List< ADASRecognizedListResult > resultList, boolean machineVision, double curSpeed ) { if ( resultList == null || resultList.isEmpty() ) { MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers( DataTypes.TYPE_MARKER_ADAS ); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index df2693c468..2fdd3d62a5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -152,7 +152,10 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen IMogoMarker marker = null; String uniqueKey = cloudRoadData.getUniqueKey(); - if ( TextUtils.isEmpty( uniqueKey ) ) { + if ( TextUtils.isEmpty( uniqueKey ) + // 本地过滤重复下发的adas识别车辆 + || AdasRecognizedResultDrawer.getInstance().hasCached( uniqueKey ) + ) { continue; } if ( mCloudSnapshotMarkersCaches.containsKey( uniqueKey ) ) { @@ -338,7 +341,7 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen private int getVrModel( CloudRoadData data ) { switch ( data.getFromType() ) { case CloudRoadData.FROM_ADAS: - return R.raw.cargrey; + return R.raw.taxi; case CloudRoadData.FROM_ROAD_UNIT: return R.raw.cargreen; case CloudRoadData.FROM_MY_LOCATION: diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java index d89f01ebf5..8ad7c4db79 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java @@ -101,6 +101,7 @@ class SnapshotUploadInTime implements MogoRTKLocation.RTKLocationListener { } } List< ADASRecognizedResult > recognizedResults = MarkerServiceHandler.getADASController().getLastADASRecognizedResult(); + Logger.d( TAG, "发送的adas识别数量 = %s", recognizedResults == null ? 0 : recognizedResults.size() ); OnePerSecondSendContent content = new OnePerSecondSendContent(); content.self = locationResult; content.adas = recognizedResults;