From cc1cc247fdbbcf6b5bf6964f83f03c5e36c91b55 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 16 Nov 2021 22:09:40 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=20=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../hmi/ui/setting/DebugSettingView.kt        | 22 ++++++-
 .../main/res/layout/view_debug_setting.xml    | 58 ++++++++++++++++++-
 gradle.properties                             |  2 +-
 .../mogo/map/impl/custom/AMapViewWrapper.java |  2 +-
 .../uicontroller/IMogoMapUIController.java    | 17 +++---
 5 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 8d60900ac7..6b87e68dbc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -219,7 +219,7 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
-        /*// 切换地图中心点视角
+        // 切换地图中心点视角
         tbChangeCarCenter100.setOnClickListener {
             CallerHDMapManager.changeMaoViewAngle(1)
         }
@@ -231,7 +231,25 @@ class DebugSettingView @JvmOverloads constructor(
         }
         tbChangeCarTwoFifths80.setOnClickListener {
             CallerHDMapManager.changeMaoViewAngle(4)
-        }*/
+        }
+        tbChangeCAR_AFTER_30_FRONT_80.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(5)
+        }
+        tbChangeCAR_AFTER_30_FRONT_100.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(6)
+        }
+        tbChangeCAR_AFTER_30_FRONT_120.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(7)
+        }
+        tbChangeCAR_AFTER_40_FRONT_80.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(8)
+        }
+        tbChangeCAR_AFTER_40_FRONT_100.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(9)
+        }
+        tbChangeCAR_AFTER_40_FRONT_120.setOnClickListener {
+            CallerHDMapManager.changeMaoViewAngle(10)
+        }
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index df38a7cfd8..8895506ee2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -91,7 +91,7 @@
                     android:textOn="显示「车辆检测」"
                     android:textSize="@dimen/dp_34" />
 
-               <!-- <Button
+                <Button
                     android:id="@+id/tbChangeCarCenter100"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -125,7 +125,61 @@
                     android:layout_margin="2dp"
                     android:gravity="center"
                     android:text="切换 CAR_TWO_FIFTHS_80"
-                    android:textSize="@dimen/dp_34" />-->
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_30_FRONT_80"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_30_FRONT_80"
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_30_FRONT_100"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_30_FRONT_100"
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_30_FRONT_120"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_30_FRONT_120"
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_40_FRONT_80"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_40_FRONT_80"
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_40_FRONT_100"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_40_FRONT_100"
+                    android:textSize="@dimen/dp_34" />
+
+                <Button
+                    android:id="@+id/tbChangeCAR_AFTER_40_FRONT_120"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:text="切换 CAR_AFTER_40_FRONT_120"
+                    android:textSize="@dimen/dp_34" />
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/gradle.properties b/gradle.properties
index 3fcd3b2259..2f7a7919ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,7 @@ MOGO_TRAFFICLIVE_VERSION=1.2.9
 MOGO_LOCATION_VERSION=1.2.9
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=V2.0.0.6
+MAP_SDK_VERSION=V2.0.0.7
 # websocket
 WEBSOCKET_VERSION=1.1.7
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
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 24d223f968..4cbcac323b 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
@@ -725,7 +725,7 @@ public class AMapViewWrapper implements IMogoMapView,
     @Override
     public void changeMapViewAngle(int type) {
         if (checkAMapView()) {
-            //mMapView.getMapAutoViewHelper().testMapViewAngle(type);
+            mMapView.getMapAutoViewHelper().testMapViewAngle(type);
         }
     }
 
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index 6973ebd20d..1e6bd3a7b6 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -4,14 +4,11 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.location.Location;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.anim.OnMarkerAnimationListener;
 
 import org.json.JSONObject;
 
@@ -239,10 +236,16 @@ public interface IMogoMapUIController {
 
     /**
      * 修改地图中心
-     * MapAutoApi.CAR_CENTER_100  1/4
-     * MapAutoApi.CAR_CENTER_100  2/5
-     * MapAutoApi.CAR_CENTER_100  80米
-     * MapAutoApi.CAR_CENTER_100  2/5
+     * MapAutoApi.CAR_CENTER_100 = 1
+     * MapAutoApi.CAR_QUARTER_100 = 2
+     * MapAutoApi.CAR_TWO_FIFTHS_100 = 3
+     * MapAutoApi.CAR_TWO_FIFTHS_80= 4
+     * MapAutoApi.CAR_AFTER_30_FRONT_80 = 5
+     * MapAutoApi.CAR_AFTER_30_FRONT_100 = 6
+     * MapAutoApi.CAR_AFTER_30_FRONT_120 = 7
+     * MapAutoApi.CAR_AFTER_40_FRONT_80= 8
+     * MapAutoApi.CAR_AFTER_40_FRONT_100 = 9
+     * MapAutoApi.CAR_AFTER_40_FRONT_120 = 10
      */
     void changeMapViewAngle(int type);