From 18bbd1debf2918da99b3b0cf0a83f70347d0e5bc Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 24 Jul 2020 15:05:24 +0800 Subject: [PATCH] =?UTF-8?q?"=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/functions/baseservices.gradle | 1 - libraries/map-custom/build.gradle | 5 +---- .../com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle index 0372c05860..cd44946ee1 100644 --- a/app/functions/baseservices.gradle +++ b/app/functions/baseservices.gradle @@ -9,7 +9,6 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk em4Implementation rootProject.ext.dependencies.mogobaseserviceapk e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk - e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk f8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk em3Implementation rootProject.ext.dependencies.mogobaseserviceapk } else { diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index b468470aeb..edcd8863f0 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,10 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT', { - exclude group: 'io.netty', module: 'netty-buffer' - exclude group: 'io.netty', module: 'netty-common' - } + api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() 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 e6f1555310..4a955a7458 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 @@ -475,4 +475,8 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { mMarker.startSmooth(newPoints,duration*1000); } + @Override + public void startScaleAnimationWithAlpha( float fromX, float toX, float fromY, float toY, float fromAlpha, float toAlpha, int duration, Interpolator interpolator, OnMarkerAnimationListener listener ) { + + } }