From ad40ac75ffccbc7857755c29aab4fc8812afd0d8 Mon Sep 17 00:00:00 2001
From: jiaguofeng <jiaguofeng>
Date: Wed, 8 Jul 2020 15:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  |  6 ++++++
 libraries/map-custom/build.gradle                 |  5 +++++
 .../com/mogo/map/impl/custom/AMapViewWrapper.java | 15 +++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cd753934aa..132738100d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,12 @@ android {
             }
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/proguard/coroutines.pro'
+        exclude 'META-INF/*'
+    }
+
     signingConfigs {
         release {
             keyAlias = 'CarLauncher'
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index ff6dadce58..edcd8863f0 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -27,6 +27,11 @@ android {
         targetCompatibility 1.8
     }
 
+    packagingOptions {
+        exclude 'META-INF/proguard/coroutines.pro'
+        exclude 'META-INF/*'
+    }
+
 }
 
 dependencies {
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 38fdc5caa9..63f6cb1f18 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
@@ -31,6 +31,7 @@ import com.zhidaoauto.map.sdk.inner.common.MapHelper;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
 import com.zhidaoauto.map.sdk.open.MapParams;
 import com.zhidaoauto.map.sdk.open.abs.MapStatusListener;
+import com.zhidaoauto.map.sdk.open.abs.OnCameraChangeListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapClickListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapTouchListener;
@@ -54,7 +55,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, LocationListener, OnMapLoadedListener, MapStatusListener,
+public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, LocationListener, OnMapLoadedListener, MapStatusListener, OnCameraChangeListener,
         OnMapClickListener, OnMapTouchListener, Marker.OnMarkClickListener {
 
     private static final String TAG = "AMapViewWrapper";
@@ -158,6 +159,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ZOOM);
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ROTATE);
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_3D);
+        mMapView.setMOnCameraChangeListener(this);
 
 //        mMapView.setOnPolylineClickListener( this );
 //        mMapView.setAMapNaviViewListener( this );
@@ -706,7 +708,16 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
     @Override
     public void onMapStatusChanged(int type, int value) {
         Log.i(TAG, "onMapStatusChanged: "+type+","+value);
-        CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
+    }
+
+    @Override
+    public void onCameraChange(int i, int i1) {
+
+    }
+
+    @Override
+    public void onCameraChangeFinish(@Nullable CameraPosition cameraPosition) {
+        Log.i(TAG, "onCameraChangeFinish: "+cameraPosition);
         if ( cameraPosition != null ) {
             Trace.beginSection( "timer.onCameraChangeFinish" );
             MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap( cameraPosition.getTarget() ),