From 00678b484242048f1b1400a4c2141b2c2ffc629e Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Mon, 17 Jun 2024 16:35:49 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][map]=20=E6=B7=BB=E5=8A=A0=E6=97=A0?=
 =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E8=A7=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhidaoauto/map/sdk/inner/common/ConstantExt.kt   | 12 ++++++++++++
 .../zhidaoauto/map/sdk/inner/map/MapController.kt    |  9 +++++++++
 .../com/mogo/map/uicontroller/VisualAngleMode.kt     |  7 ++++++-
 .../src/main/java/com/mogo/map/AMapViewWrapper.kt    |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt
index 407505446d..d2d7d0f69c 100644
--- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt
+++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt
@@ -32,6 +32,18 @@ object ConstantExt {
     //高程数据模式
     const val MAP_STYLE_VR_BRIDGE= 100
 
+    //无人机视角
+    const val MAP_STYLE_VR_ANGLE_DRONE = 11
+
+    //无人机视角-摄像机高度
+    const val MAP_STYLE_VR_EYE_HEIGHT_DRONE = 21.1f
+
+    //无人机视角-摄像机角度
+    const val MAP_STYLE_VR_OVER_LOOK_DRONE = 19.8f
+
+    //无人机视角-缩放值
+    const val MAP_STYLE_VR_ZOOM_VAL_DRONE = 2.9f
+
     //漫游距离1公里
     const val ROAM_DIS_1KM = 1000f
     //漫游距离3公里
diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt
index 5c5725cb9f..b75b51fb0e 100644
--- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt
+++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt
@@ -1549,6 +1549,15 @@ class MapController(private var context: Context?, private val mMapView: IMapVie
 //                )
 //
 //            }
+            ConstantExt.MAP_STYLE_VR_ANGLE_DRONE -> {
+                disableSkyboxAndInterpolation(
+                    ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_DRONE,
+                    ConstantExt.MAP_STYLE_VR_OVER_LOOK_DRONE,
+                    ConstantExt.MAP_STYLE_VR_ZOOM_VAL_DRONE,
+                    ConstantExt.MAP_STYLE_VR_ANGLE_DRONE,
+                    -1
+                )
+            }
         }
         if(type != ConstantExt.MAP_STYLE_VR_ROAM) {
             mEventController?.dispatchMapViewVisualAngleChangeListener(type)
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
index 6d6e1e1116..9f09a1647e 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
@@ -52,7 +52,12 @@ enum class VisualAngleMode(val code: Int) : IMogoMapVisualAngle {
     /**
      * 天空盒模式
      */
-    MAP_STYLE_VR_SKY_BOX(10);
+    MAP_STYLE_VR_SKY_BOX(10),
+
+    /**
+     * 无人机模式
+     */
+    MAP_STYLE_VR_DRONE(11);
 
     override val isLongSight: Boolean
         get() = code == MODE_LONG_SIGHT.code
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
index b5d62b348c..57d879a8c0 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
@@ -319,7 +319,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
                     e(M_MAP + TAG, "切换地图近景需要传入要移动的经纬度数据")
                     return
                 }
-                // 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。
+               // 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。
                 mapAutoViewHelper.setNearViewAnglePosition(
                     LonLatPoint(
                         mogoLatLng.lon,