From 42279b1a3af5a452eeac5bf8144158c56837e05e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 28 Oct 2020 18:51:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86=E5=9C=B0=E5=9B=BE=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=B8=9A=E5=8A=A1=E4=B8=8B=E6=B2=89=E5=88=B0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-custom/build.gradle | 2 +- .../mogo/module/common/drawer/AdasRecognizedResultDrawer.java | 2 +- .../com/mogo/module/common/drawer/SnapshotSetDataDrawer.java | 3 ++- .../main/java/com/mogo/module/common/entity/CloudRoadData.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 6e93301417..9ee986a20f 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-online-23' + implementation 'com.zhidaoauto.machine:map:1.0.0-online-25' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() 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 917f883c74..bd8dc29f45 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 @@ -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 ); } } 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 c45a635e18..974b9674a0 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 @@ -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 ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java index 80733fdf11..945bdda8e2 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java @@ -101,7 +101,7 @@ public class CloudRoadData implements Parcelable { } public double getDistance() { - return distance; + return distance * 1000; } public void setDistance(double distance) { From 7d61298107bda782ac7dcc1956c009c660964bc8 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 28 Oct 2020 18:52:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=86=E5=9C=B0=E5=9B=BE=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=B8=9A=E5=8A=A1=E4=B8=8B=E6=B2=89=E5=88=B0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 4bfff517c3..188236aa96 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -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 ); }