From 047d4abbfc855019fb86a03402c1649ccba0144f Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Wed, 17 Nov 2021 11:39:59 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E5=8F=91=E5=B8=832.0.75=EF=BC=8C0.0.19?=
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        |   4 +-
 .../main/res/layout/view_debug_setting.xml    |   4 +-
 gradle.properties                             | 162 +++++++++---------
 .../mogo/map/impl/custom/AMapViewWrapper.java |   2 +-
 4 files changed, 86 insertions(+), 86 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 6b87e68dbc..1042d98a13 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)
         }
@@ -249,7 +249,7 @@ class DebugSettingView @JvmOverloads constructor(
         }
         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 8895506ee2..c6217eadf4 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"
@@ -179,7 +179,7 @@
                     android:layout_margin="2dp"
                     android:gravity="center"
                     android:text="切换 CAR_AFTER_40_FRONT_120"
-                    android:textSize="@dimen/dp_34" />
+                    android:textSize="@dimen/dp_34" />-->
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/gradle.properties b/gradle.properties
index 92b74cb437..0a31f8d3e1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,7 +37,7 @@ kapt.include.compile.classpath=false
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.jetifier.blacklist=module-service-2.0.73.aar
+android.jetifier.blacklist=module-service-2.0.75.aar
 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
 SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -79,7 +79,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.0
 MOGO_LOCATION_VERSION=1.3.0
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=V2.0.0.7
+MAP_SDK_VERSION=V2.0.0.6
 # websocket
 WEBSOCKET_VERSION=1.1.7
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
@@ -88,102 +88,102 @@ applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.14
 ################# 新架构模块Maven版本管理 #################
-MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.17
-MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.17
-MOGO_CORE_FUNCTION_HMI_VERSION=0.0.17
-MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.17
-MOGO_CORE_FUNCTION_MAP_VERSION=0.0.17
-MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.17
-MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.17
-MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.17
-MOGO_CORE_FUNCTION_SMP_VERSION=0.0.17
-MOGO_CORE_FUNCTION_V2X_VERSION=0.0.17
-MOGO_CORE_DATA_VERSION=0.0.17
-MOGO_CORE_FUNCTION_API_VERSION=0.0.17
-MOGO_CORE_FUNCTION_CALL_VERSION=0.0.17
-MOGO_CORE_RES_VERSION=0.0.17
-MOGO_CORE_UTILS_VERSION=0.0.17
-MOGO_CORE_NETWORK_VERSION=0.0.17
+MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.19
+MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.19
+MOGO_CORE_FUNCTION_HMI_VERSION=0.0.19
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.19
+MOGO_CORE_FUNCTION_MAP_VERSION=0.0.19
+MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.19
+MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.19
+MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.19
+MOGO_CORE_FUNCTION_SMP_VERSION=0.0.19
+MOGO_CORE_FUNCTION_V2X_VERSION=0.0.19
+MOGO_CORE_DATA_VERSION=0.0.19
+MOGO_CORE_FUNCTION_API_VERSION=0.0.19
+MOGO_CORE_FUNCTION_CALL_VERSION=0.0.19
+MOGO_CORE_RES_VERSION=0.0.19
+MOGO_CORE_UTILS_VERSION=0.0.19
+MOGO_CORE_NETWORK_VERSION=0.0.19
 ################# 旧版本架构模块版本 #################
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.0.73
-MOGO_UTILS_VERSION=2.0.73
-MAP_AMAP_VERSION=2.0.73
-MAP_AUTONAVI_VERSION=2.0.73
-MOGO_MAP_VERSION=2.0.73
-MOGO_MAP_API_VERSION=2.0.73
-MOGO_SERVICE_VERSION=2.0.73
-MOGO_SERVICE_API_VERSION=2.0.73
-MOGO_CONNECTION_VERSION=2.0.73
-MOGO_MODULE_APPS_VERSION=2.0.73
-MOGO_MODULE_NAVI_VERSION=2.0.73
-MOGO_MODULE_SHARE_VERSION=2.0.73
-MOGO_MODULE_COMMON_VERSION=2.0.73
-MOGO_MODULE_MAIN_VERSION=2.0.73
-MOGO_MODULE_MAP_VERSION=2.0.73
-MOGO_MODULE_SERVICE_VERSION=2.0.73
-MOGO_MODULE_EXTENSIONS_VERSION=2.0.73
-MOGO_MODULE_SEARCH_VERSION=2.0.73
-MOGO_MODULE_BACK_VERSION=2.0.73
-MOGO_MODULE_V2X_VERSION=2.0.73
+MOGO_COMMONS_VERSION=2.0.75
+MOGO_UTILS_VERSION=2.0.75
+MAP_AMAP_VERSION=2.0.75
+MAP_AUTONAVI_VERSION=2.0.75
+MOGO_MAP_VERSION=2.0.75
+MOGO_MAP_API_VERSION=2.0.75
+MOGO_SERVICE_VERSION=2.0.75
+MOGO_SERVICE_API_VERSION=2.0.75
+MOGO_CONNECTION_VERSION=2.0.75
+MOGO_MODULE_APPS_VERSION=2.0.75
+MOGO_MODULE_NAVI_VERSION=2.0.75
+MOGO_MODULE_SHARE_VERSION=2.0.75
+MOGO_MODULE_COMMON_VERSION=2.0.75
+MOGO_MODULE_MAIN_VERSION=2.0.75
+MOGO_MODULE_MAP_VERSION=2.0.75
+MOGO_MODULE_SERVICE_VERSION=2.0.75
+MOGO_MODULE_EXTENSIONS_VERSION=2.0.75
+MOGO_MODULE_SEARCH_VERSION=2.0.75
+MOGO_MODULE_BACK_VERSION=2.0.75
+MOGO_MODULE_V2X_VERSION=2.0.75
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.0.73
+MOGO_MODULE_TANLU_VERSION=2.0.75
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.0.73
-MOGO_MODULE_PUSH_BASE_VERSION=2.0.73
-MOGO_MODULE_PUSH_NOOP_VERSION=2.0.73
+MOGO_MODULE_PUSH_VERSION=2.0.75
+MOGO_MODULE_PUSH_BASE_VERSION=2.0.75
+MOGO_MODULE_PUSH_NOOP_VERSION=2.0.75
 # 探路上报和分享模块
-TANLULIB_VERSION=2.0.73
-MOGO_TANLU_API_VERSION=2.0.73
+TANLULIB_VERSION=2.0.75
+MOGO_TANLU_API_VERSION=2.0.75
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.0.73
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.73
+MOGO_MODULE_LEFT_PANEL_VERSION=2.0.75
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.75
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.0.73
+MOGO_MODULE_WIDGETS_VERSION=2.0.75
 # obu
-MOGO_MODULE_OBU_VERSION=2.0.73
-MOGO_MODULE_OBU_MOGO_VERSION=2.0.73
+MOGO_MODULE_OBU_VERSION=2.0.75
+MOGO_MODULE_OBU_MOGO_VERSION=2.0.75
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.0.73
+MOGO_MODULE_MONITOR_VERSION=2.0.75
 # bugly
-CRASHREPORT_VERSION=0.0.15
-CRASHREPORT_BUGLY_VERSION=2.0.73
-CRASHREPORT_NOOP_VERSION=2.0.73
-CRASHREPORT_UPGRADE_VERSION=2.0.73
+CRASHREPORT_VERSION=2.0.75
+CRASHREPORT_BUGLY_VERSION=2.0.75
+CRASHREPORT_NOOP_VERSION=2.0.75
+CRASHREPORT_UPGRADE_VERSION=2.0.75
 ## tts
-TTS_BASE_VERSION=2.0.73
-TTS_DI_VERSION=2.0.73
-TTS_ZHI_VERSION=2.0.73
-TTS_PAD_VERSION=2.0.73
-TTS_NOOP_VERSION=2.0.73
+TTS_BASE_VERSION=2.0.75
+TTS_DI_VERSION=2.0.75
+TTS_ZHI_VERSION=2.0.75
+TTS_PAD_VERSION=2.0.75
+TTS_NOOP_VERSION=2.0.75
 # 自研地图
-MAP_CUSTOM_VERSION=2.0.73
-MOGO_MODULE_ADAS_VERSION=2.0.73
+MAP_CUSTOM_VERSION=2.0.75
+MOGO_MODULE_ADAS_VERSION=2.0.75
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.73
-MOGO_BASE_SERVICES_APK_VERSION=2.0.73
-MOGO_BASE_SERVICES_SDK_VERSION=2.0.73
-MOGO_MODULE_CHAT_VERSION=2.0.73
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.75
+MOGO_BASE_SERVICES_APK_VERSION=2.0.75
+MOGO_BASE_SERVICES_SDK_VERSION=2.0.75
+MOGO_MODULE_CHAT_VERSION=2.0.75
 # 车聊聊
-MOGO_MODULE_CARCHATTING_VERSION=2.0.73
+MOGO_MODULE_CARCHATTING_VERSION=2.0.75
 # 车聊聊接口
-MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.73
+MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.75
 
 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.0.73
-MOGO_SKIN_LIGHT_VERSION=2.0.73
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.73
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.73
-SKIN_SUPPORT_VERSION=2.0.73
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.73
-SKIN_SUPPORT_CARDVIEW_VERSION=2.0.73
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.73
-SKIN_SUPPORT_DESIGN_VERSION=2.0.73
+MOGO_SKIN_SUPPORT_VERSION=2.0.75
+MOGO_SKIN_LIGHT_VERSION=2.0.75
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.75
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.75
+SKIN_SUPPORT_VERSION=2.0.75
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.75
+SKIN_SUPPORT_CARDVIEW_VERSION=2.0.75
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.75
+SKIN_SUPPORT_DESIGN_VERSION=2.0.75
 # OCH
-MOGO_OCH_VERSION=2.0.73-test
-MOGO_OCH_BUS_VERSION=2.0.73-test
-MOGO_OCH_NOOP_VERSION=2.0.73-test
-MOGO_OCH_TAXI_VERSION=2.0.73-test
+MOGO_OCH_VERSION=2.0.75-test
+MOGO_OCH_BUS_VERSION=2.0.75-test
+MOGO_OCH_NOOP_VERSION=2.0.75-test
+MOGO_OCH_TAXI_VERSION=2.0.75-test
 # mogoAiCloud sdk services
-MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.73
+MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.75
 ################# 旧版本架构模块版本 #################
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);
         }
     }