From 382e82527cfb34e07b4d2ee057ec0bbc54ab42e4 Mon Sep 17 00:00:00 2001
From: jiaguofeng <jiaguofeng>
Date: Fri, 19 Jun 2020 15:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9zoom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/map/impl/custom/AMapViewWrapper.java | 20 ++++++++++++++-----
 .../com/mogo/map/impl/custom/AMapWrapper.java |  3 +--
 2 files changed, 16 insertions(+), 7 deletions(-)

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 9ae47cfe5a..82c26673cd 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
@@ -27,7 +27,9 @@ import com.mogo.map.uicontroller.MapCameraPosition;
 import com.mogo.map.uicontroller.MapControlResult;
 import com.mogo.utils.logger.Logger;
 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.OnMapClickListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapTouchListener;
@@ -47,7 +49,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, LocationListener, OnMapLoadedListener,
+public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, LocationListener, OnMapLoadedListener, MapStatusListener,
         OnMapClickListener, OnMapTouchListener, Marker.OnMarkClickListener {
 
     private static final String TAG = "AMapViewWrapper";
@@ -147,6 +149,9 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
         mMapView.setOnMapTouchListener(this);
         mMapView.setOnMapClickListener(this);
         mMapView.getLocationClient().registerListener(this);
+        mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ZOOM);
+        mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ROTATE);
+        mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_3D);
 
 //        mMapView.setOnPolylineClickListener( this );
 //        mMapView.setAMapNaviViewListener( this );
@@ -269,7 +274,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
     @Override
     public MapControlResult changeZoom(boolean zoom) {
         if (checkAMapView()) {
-            mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f);
+            mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f)/2;
 
             if (zoom) {
                 if (mDefaultZoomLevel >= 7) {
@@ -434,8 +439,8 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
 //            if ( DebugConfig.isDebug() ) {
 //                Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
 //            }
-            Logger.d(TAG, "锁车");
-            mMapView.getMapAutoViewHelper().setLockMode(true);
+            Log.d(TAG, "锁车");
+            mMapView.getMapAutoViewHelper().setLockMode(false);
             mIsCarLocked = true;
         }
     }
@@ -445,7 +450,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
         if (DebugConfig.isDebug()) {
             Logger.d(TAG, Log.getStackTraceString(new Throwable()));
         }
-        Logger.d(TAG, "解锁锁车");
+        Log.d(TAG, "解锁锁车");
         mMapView.getMapAutoViewHelper().setLockMode(false);
         mIsCarLocked = false;
     }
@@ -722,4 +727,9 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
     public void onRoadLoaded(@Nullable String s) {
 
     }
+
+    @Override
+    public void onMapStatusChanged(int type, int value) {
+        Log.i(TAG, "onMapStatusChanged: "+type+","+value);
+    }
 }
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
index 78761ccbaa..a8c5ddaf58 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
@@ -171,7 +171,6 @@ public class AMapWrapper implements IMogoMap {
     @Override
     public void setTouchPoiEnable(boolean touchPoiEnable) {
         if (checkAMap()) {
-            // TODO: 2020/5/27 jia 设置
             mAMap.setTouchPoiEnable( touchPoiEnable );
         }
     }
@@ -232,7 +231,7 @@ public class AMapWrapper implements IMogoMap {
     public float getZoomLevel() {
         if (checkAMap()) {
             try {
-                return mAMap.getZoom();
+                return mAMap.getZoom()*2;
             } catch (Exception e) {
 
             }