From c30aac9a75c43cb0b34084462dbabd44dc9d849d Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 21 Nov 2023 12:09:18 +0800
Subject: [PATCH] [6.2.0] remove default map scale and fling

---
 .../java/com/mogo/eagle/core/function/view/MapBizView.kt   | 2 --
 .../src/main/java/com/autonavi/nge/map/MapView.kt          | 3 ---
 .../src/main/java/com/mogo/map/IMogoUiSettings.kt          | 7 -------
 .../src/main/java/com/mogo/map/AMapUiSettingsWrapper.kt    | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
index 9c43535bfb..582b570fe5 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
@@ -60,8 +60,6 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
             it.setScrollGesturesEnabled(true)
             //设置倾斜手势是否可用。
             it.setTiltGesturesEnabled(true)
-            //设置缩放按钮是否可见。
-            it.setZoomControlsEnabled(false)
             //设置双指缩放手势是否可用。
             it.setZoomGesturesEnabled(false)
         }
diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt
index 8f3cc0f4f0..4dbd2c7b17 100644
--- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt
+++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt
@@ -749,9 +749,6 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
         if(mMapStyleParams.isSkyBoxEnable()) {
             mMapController?.setSkyBoxMode()
         }
-        isFling = false
-        isCanZoom = true
-        isRotate = false
         mSurfaceCreated.set(true)
         if (DEBUG) {
             Log.i(TAG, "mapop-surfaceop--selfop--onSurfaceCreated：${mSurfaceCreated}")
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoUiSettings.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoUiSettings.kt
index 36ee017137..3b5427b320 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoUiSettings.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoUiSettings.kt
@@ -9,13 +9,6 @@ interface IMogoUiSettings {
      */
     fun setScaleControlsEnabled(enabled: Boolean)
 
-    /**
-     * 这个方法设置了地图是否允许显示缩放按钮。如果允许，则在地图上显示。
-     *
-     * @param enabled
-     */
-    fun setZoomControlsEnabled(enabled: Boolean)
-
     /**
      * 这个方法设置了地图是否允许显示指南针
      *
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapUiSettingsWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapUiSettingsWrapper.kt
index 3a2c7385b5..d3d7d04a95 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapUiSettingsWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapUiSettingsWrapper.kt
@@ -15,10 +15,6 @@ class AMapUiSettingsWrapper(private val mUiSettings: MapAutoViewHelper?) : IMogo
         }
     }
 
-    override fun setZoomControlsEnabled(enabled: Boolean) {
-        mUiSettings?.setZoomGesturesEnabled(enabled)
-    }
-
     override fun setCompassEnabled(enabled: Boolean) {
         if (enabled) {
             mUiSettings?.showDirection()