From 528a4ae7c236c465f197770f43ea0a3da602d2ed Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 16 Nov 2021 16:26:08 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=98=AF=E4=BC=A0=E7=BB=99=E5=B7=A5=E6=8E=A7?=
 =?UTF-8?q?=E6=9C=BA=E7=9A=84action=E5=86=99=E9=94=99=EF=BC=8C=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84json=E5=A6=82=E4=B8=8B=20{"action":"aiCloudTo?=
 =?UTF-8?q?StartAutopilot","result":{"endLatLon":{"lat":40.19925515953876,?=
 =?UTF-8?q?"lon":116.73274535677977},"isSpeakVoice":false,"speedLimit":0.0?=
 =?UTF-8?q?,"startLatLon":{"lat":40.19915728944592,"lon":116.7367589505145?=
 =?UTF-8?q?4},"vehicleType":10,"wayLatLons":null}}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt    | 2 +-
 .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt    | 2 +-
 .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt    | 4 ++--
 .../src/main/res/layout/view_debug_setting.xml                | 4 ++--
 gradle.properties                                             | 2 +-
 .../main/java/com/mogo/map/impl/custom/AMapViewWrapper.java   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
index d3dc200c61..e27cf3236b 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -36,7 +36,7 @@ class MoGoAutopilotProvider :
 
     override fun startAutoPilot(result: AutopilotControlParameters) {
         if (AdasManager.getInstance().isSocketConnect) {
-            val parameter = AutopilotControlCmdParameter(TAG, result)
+            val parameter = AutopilotControlCmdParameter("aiCloudToStartAutopilot", result)
             AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter))
         } else {
             LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶")
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index ab86a90374..7f9484e80f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -222,7 +222,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
             mWarningFloat = WarningFloat.with(it)
                 .setTag(tag)
                 .setLayout(notificationView)
-                .setSidePattern(SidePattern.TOP)
+                .setSidePattern(SidePattern.RESULT_TOP)
                 .setCountDownTime(5000)
                 .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
                 .setImmersionStatusBar(true)
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 915f48e5c3..8d60900ac7 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,7 @@ class DebugSettingView @JvmOverloads constructor(
         }
         tbChangeCarTwoFifths80.setOnClickListener {
             CallerHDMapManager.changeMaoViewAngle(4)
-        }
+        }*/
     }
 
     /**
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 dccd8a8b0e..df38a7cfd8 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,7 @@
                     android:layout_margin="2dp"
                     android:gravity="center"
                     android:text="切换 CAR_TWO_FIFTHS_80"
-                    android:textSize="@dimen/dp_34" />
+                    android:textSize="@dimen/dp_34" />-->
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/gradle.properties b/gradle.properties
index 0eb79b65dd..7e5fff0e0c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.56-live
 MOGO_LOCATION_VERSION=1.1.56-live
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=V2.0.0.6-test
+MAP_SDK_VERSION=V2.0.0.6
 # 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 4cbcac323b..24d223f968 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);
         }
     }