diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 67376f59f2..06d17c631f 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.9' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.1.0' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } 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 295aa0f3b1..81d9522a11 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 @@ -2,9 +2,6 @@ package com.mogo.module.common.drawer; import android.content.Context; import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; @@ -117,13 +114,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer { interval -= 25; marker.startSmoothInMs( points, interval ); } + } else { marker.setRotateAngle( ( ( float ) recognizedListResult.heading ) ); marker.setPosition( recognizedListResult.lat, recognizedListResult.lon ); - } else { - marker.setPosition( recognizedListResult.lat, recognizedListResult.lon ); } -// marker.setRotateAngle( ( ( float ) recognizedListResult.heading ) ); -// marker.setPosition( recognizedListResult.lat, recognizedListResult.lon ); } showSelfSpeed( mContext, marker, 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 2fdd3d62a5..860496e2d1 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 @@ -188,16 +188,9 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen CloudRoadData lastPosition = mLastPositions.get( uniqueKey ); if ( lastPosition != null ) { if ( lastPosition.equals( cloudRoadData ) ) { - if ( ( ( int ) cloudRoadData.getSpeed() ) == 0 ) { -// MapCameraPosition position = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getMapCameraPosition(); -// if ( position != null ) { -// marker.setRotateAngle( 360 - ( float ) cloudRoadData.getHeading() - position.getBearing() ); -// } else { -// } - marker.setRotateAngle( ( ( float ) cloudRoadData.getHeading() ) ); - } Logger.d( TAG, "保持位置 - %s", uniqueKey ); -// marker.setPosition( lastPosition.getLat(), lastPosition.getLon() ); + marker.setRotateAngle( ( ( float ) cloudRoadData.getHeading() ) ); + marker.setPosition( lastPosition.getLat(), lastPosition.getLon() ); } else { List< MogoLatLng > points = new ArrayList<>(); points.add( new MogoLatLng( lastPosition.getLat(), lastPosition.getLon() ) ); diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index bf351cdb25..4aca6d1380 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -42,7 +42,7 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.adasapi implementation rootProject.ext.dependencies.adasconfigapi - implementation "com.zhidao.support.adas:high:1.1.5.2" + implementation "com.zhidao.support.adas:high:1.1.5.6" if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi