From c849a87324876507c7c11835c53752160bb0e973 Mon Sep 17 00:00:00 2001
From: jiaguofeng <jiaguofeng>
Date: Thu, 30 Jul 2020 15:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=A9=E6=94=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/map/impl/custom/AMapViewWrapper.java  | 14 +++++++-------
 .../java/com/mogo/map/impl/custom/AMapWrapper.java |  3 ++-
 2 files changed, 9 insertions(+), 8 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 99876aaaf1..a96617cd9a 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
@@ -248,27 +248,27 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
     @Override
     public MapControlResult changeZoom(boolean zoom) {
         if (checkAMapView()) {
-            mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f);
+            mDefaultZoomLevel = (getMap().getZoomLevel() + 0.5f);
 
             if (zoom) {
-                if (mDefaultZoomLevel >= 20) {
+                if (mDefaultZoomLevel >= 20f) {
                     return MapControlResult.TARGET;
                 }
             } else {
-                if (mDefaultZoomLevel <= 7) {
+                if (mDefaultZoomLevel <= 7f) {
                     return MapControlResult.TARGET;
                 }
             }
 
             if (zoom) {
                 mDefaultZoomLevel += 1f;
-                if (mDefaultZoomLevel > 19) {
-                    mDefaultZoomLevel = 19;
+                if (mDefaultZoomLevel > 19f) {
+                    mDefaultZoomLevel = 19f;
                 }
             } else {
                 mDefaultZoomLevel -= 1f;
-                if (mDefaultZoomLevel < 8) {
-                    mDefaultZoomLevel = 8;
+                if (mDefaultZoomLevel < 8f) {
+                    mDefaultZoomLevel = 8f;
                 }
             }
             changeZoom(mDefaultZoomLevel);
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 113f6479ab..8ee3e0c76d 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
@@ -227,6 +227,7 @@ public class AMapWrapper implements IMogoMap {
 
     @Override
     public void changeZoom(float zoom) {
+        Logger.d(TAG, "changeZoom %s", zoom);
         if (checkAMap()) {
             mAMap.setZoom((int) zoom);
         }
@@ -236,7 +237,7 @@ public class AMapWrapper implements IMogoMap {
     public float getZoomLevel() {
         if (checkAMap()) {
             try {
-                return mAMap.getZoom()*2;
+                return mAMap.getZoom();
             } catch (Exception e) {
 
             }