From b79d24e089a84ebc850302bba51b57461bd73ec4 Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Tue, 30 Jun 2020 11:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=9A=E7=82=B9=E5=8A=A8?= =?UTF-8?q?=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/custom/marker/AMapMarkerWrapper.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java index 7c6fb883aa..2ea989dcc1 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java @@ -6,6 +6,7 @@ import android.util.Log; import android.view.View; import android.view.animation.Animation; import android.view.animation.Interpolator; +import android.view.animation.ScaleAnimation; import android.view.animation.TranslateAnimation; import com.mogo.commons.AbsMogoApplication; @@ -20,6 +21,7 @@ import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.marker.anim.OnMarkerAnimationListener; import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; +import com.zhidaoauto.map.sdk.inner.marker.MarkerScaleAnimation; import com.zhidaoauto.map.sdk.inner.marker.MarkerTranslateAnimation; import com.zhidaoauto.map.sdk.open.marker.Marker; import com.zhidaoauto.map.sdk.open.marker.MarkerInfo; @@ -357,8 +359,8 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { return; } -// ScaleAnimation animationScale = new ScaleAnimation(fromX, toX, fromY, toY); -// animationScale.setDuration(duration); + MarkerScaleAnimation animationScale = new MarkerScaleAnimation(fromX, toX); + animationScale.setDuration(duration); // animationScale.setFillMode(Animation.FILL_MODE_FORWARDS); // animationScale.setInterpolator(interpolator); // animationScale.setAnimationListener(new Animation.AnimationListener() { @@ -382,9 +384,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { // } // } // }); -// -// mMarker.setAnimation(animationScale); -// mMarker.startAnimation(); + + mMarker.setMarkerScaleAnimation(animationScale); + mMarker.startAnimation(); } @Override @@ -424,7 +426,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { //整个移动所需要的时间 animation.setDuration(duration); //设置动画 - mMarker.setAnimation(animation); + mMarker.setTranslateAnimation(animation); mMarker.startAnimation(); } catch (Exception e) { Logger.e(TAG, e, "error.");