From 92565c7c6e4a29788d8ebd3fb75e616345bfce26 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Mon, 13 Dec 2021 11:26:50 +0800
Subject: [PATCH] =?UTF-8?q?[Upload]=20=E5=8F=91=E5=B8=83=20Maven=200.0.46?=
 =?UTF-8?q?=202.1.4=20=E5=A2=9E=E5=8A=A0=E6=89=93=E5=BC=80=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=9F=E5=BA=A6=20CallerHmiManager.showToolsView()?=
 =?UTF-8?q?=20CallerHmiManager.hideToolsView()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 ZD_README/README_Call.md |   2 +
 gradle.properties        | 154 +++++++++++++++++++--------------------
 upload.sh                |   2 +-
 3 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/ZD_README/README_Call.md b/ZD_README/README_Call.md
index 976e1dd41b..652ee01041 100644
--- a/ZD_README/README_Call.md
+++ b/ZD_README/README_Call.md
@@ -22,6 +22,8 @@ showWarning                            : 展示指定方位上的红框预警，
 showWarningTrafficLight                : 展示红绿灯预警，0-都是默认不亮起，1-红，2-黄，3-绿
 showWarningV2X                         : 展示VR下V2X预警
 vipIdentification                      : VIP标志展示控制
+showToolsView                          : 打开工具View
+hideToolsView                          : 关闭工具View
 ```
 
 * ### 高精 MAP 图层 相关 -> [CallerHDMapManager.kt][DebugSettingView.kt] -> [Demo][DebugSettingView.kt]
diff --git a/gradle.properties b/gradle.properties
index 3a6afb0567..6cf76dd95c 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.1.2.aar
+android.jetifier.blacklist=module-service-2.1.4.aar
 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
 SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -89,102 +89,102 @@ applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.15
 ################# 新架构模块Maven版本管理 #################
-MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.44
-MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.44
-MOGO_CORE_FUNCTION_HMI_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MAP_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.44
-MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.44
-MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.44
-MOGO_CORE_FUNCTION_SMP_VERSION=0.0.44
-MOGO_CORE_FUNCTION_V2X_VERSION=0.0.44
-MOGO_CORE_DATA_VERSION=0.0.44
-MOGO_CORE_FUNCTION_API_VERSION=0.0.44
-MOGO_CORE_FUNCTION_CALL_VERSION=0.0.44
-MOGO_CORE_RES_VERSION=0.0.44
-MOGO_CORE_UTILS_VERSION=0.0.44
-MOGO_CORE_NETWORK_VERSION=0.0.44
+MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.46
+MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.46
+MOGO_CORE_FUNCTION_HMI_VERSION=0.0.46
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.46
+MOGO_CORE_FUNCTION_MAP_VERSION=0.0.46
+MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.46
+MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.46
+MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.46
+MOGO_CORE_FUNCTION_SMP_VERSION=0.0.46
+MOGO_CORE_FUNCTION_V2X_VERSION=0.0.46
+MOGO_CORE_DATA_VERSION=0.0.46
+MOGO_CORE_FUNCTION_API_VERSION=0.0.46
+MOGO_CORE_FUNCTION_CALL_VERSION=0.0.46
+MOGO_CORE_RES_VERSION=0.0.46
+MOGO_CORE_UTILS_VERSION=0.0.46
+MOGO_CORE_NETWORK_VERSION=0.0.46
 ################# 旧版本架构模块版本 #################
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.1.2
-MOGO_UTILS_VERSION=2.1.2
-MAP_AMAP_VERSION=2.1.2
-MAP_AUTONAVI_VERSION=2.1.2
-MOGO_MAP_VERSION=2.1.2
-MOGO_MAP_API_VERSION=2.1.2
-MOGO_SERVICE_VERSION=2.1.2
-MOGO_SERVICE_API_VERSION=2.1.2
-MOGO_CONNECTION_VERSION=2.1.2
-MOGO_MODULE_APPS_VERSION=2.1.2
-MOGO_MODULE_NAVI_VERSION=2.1.2
-MOGO_MODULE_SHARE_VERSION=2.1.2
-MOGO_MODULE_COMMON_VERSION=2.1.2
-MOGO_MODULE_MAIN_VERSION=2.1.2
-MOGO_MODULE_MAP_VERSION=2.1.2
-MOGO_MODULE_SERVICE_VERSION=2.1.2
-MOGO_MODULE_EXTENSIONS_VERSION=2.1.2
-MOGO_MODULE_SEARCH_VERSION=2.1.2
-MOGO_MODULE_BACK_VERSION=2.1.2
-MOGO_MODULE_V2X_VERSION=2.1.2
+MOGO_COMMONS_VERSION=2.1.4
+MOGO_UTILS_VERSION=2.1.4
+MAP_AMAP_VERSION=2.1.4
+MAP_AUTONAVI_VERSION=2.1.4
+MOGO_MAP_VERSION=2.1.4
+MOGO_MAP_API_VERSION=2.1.4
+MOGO_SERVICE_VERSION=2.1.4
+MOGO_SERVICE_API_VERSION=2.1.4
+MOGO_CONNECTION_VERSION=2.1.4
+MOGO_MODULE_APPS_VERSION=2.1.4
+MOGO_MODULE_NAVI_VERSION=2.1.4
+MOGO_MODULE_SHARE_VERSION=2.1.4
+MOGO_MODULE_COMMON_VERSION=2.1.4
+MOGO_MODULE_MAIN_VERSION=2.1.4
+MOGO_MODULE_MAP_VERSION=2.1.4
+MOGO_MODULE_SERVICE_VERSION=2.1.4
+MOGO_MODULE_EXTENSIONS_VERSION=2.1.4
+MOGO_MODULE_SEARCH_VERSION=2.1.4
+MOGO_MODULE_BACK_VERSION=2.1.4
+MOGO_MODULE_V2X_VERSION=2.1.4
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.1.2
+MOGO_MODULE_TANLU_VERSION=2.1.4
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.1.2
-MOGO_MODULE_PUSH_BASE_VERSION=2.1.2
-MOGO_MODULE_PUSH_NOOP_VERSION=2.1.2
+MOGO_MODULE_PUSH_VERSION=2.1.4
+MOGO_MODULE_PUSH_BASE_VERSION=2.1.4
+MOGO_MODULE_PUSH_NOOP_VERSION=2.1.4
 # 探路上报和分享模块
-TANLULIB_VERSION=2.1.2
-MOGO_TANLU_API_VERSION=2.1.2
+TANLULIB_VERSION=2.1.4
+MOGO_TANLU_API_VERSION=2.1.4
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.1.2
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.2
+MOGO_MODULE_LEFT_PANEL_VERSION=2.1.4
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.4
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.1.2
+MOGO_MODULE_WIDGETS_VERSION=2.1.4
 # obu
-MOGO_MODULE_OBU_VERSION=2.1.2
-MOGO_MODULE_OBU_MOGO_VERSION=2.1.2
+MOGO_MODULE_OBU_VERSION=2.1.4
+MOGO_MODULE_OBU_MOGO_VERSION=2.1.4
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.1.2
+MOGO_MODULE_MONITOR_VERSION=2.1.4
 # bugly
-CRASHREPORT_VERSION=2.1.2
-CRASHREPORT_BUGLY_VERSION=2.1.2
-CRASHREPORT_NOOP_VERSION=2.1.2
-CRASHREPORT_UPGRADE_VERSION=2.1.2
+CRASHREPORT_VERSION=2.1.4
+CRASHREPORT_BUGLY_VERSION=2.1.4
+CRASHREPORT_NOOP_VERSION=2.1.4
+CRASHREPORT_UPGRADE_VERSION=2.1.4
 ## tts
-TTS_BASE_VERSION=2.1.2
-TTS_DI_VERSION=2.1.2
-TTS_ZHI_VERSION=2.1.2
-TTS_PAD_VERSION=2.1.2
-TTS_NOOP_VERSION=2.1.2
+TTS_BASE_VERSION=2.1.4
+TTS_DI_VERSION=2.1.4
+TTS_ZHI_VERSION=2.1.4
+TTS_PAD_VERSION=2.1.4
+TTS_NOOP_VERSION=2.1.4
 # 自研地图
-MAP_CUSTOM_VERSION=2.1.2
-MOGO_MODULE_ADAS_VERSION=2.1.2
+MAP_CUSTOM_VERSION=2.1.4
+MOGO_MODULE_ADAS_VERSION=2.1.4
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.2
-MOGO_BASE_SERVICES_APK_VERSION=2.1.2
-MOGO_BASE_SERVICES_SDK_VERSION=2.1.2
-MOGO_MODULE_CHAT_VERSION=2.1.2
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.4
+MOGO_BASE_SERVICES_APK_VERSION=2.1.4
+MOGO_BASE_SERVICES_SDK_VERSION=2.1.4
+MOGO_MODULE_CHAT_VERSION=2.1.4
 # 车聊聊
-MOGO_MODULE_CARCHATTING_VERSION=2.1.2
+MOGO_MODULE_CARCHATTING_VERSION=2.1.4
 # 车聊聊接口
-MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.2
+MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.4
 
 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.1.2
-MOGO_SKIN_LIGHT_VERSION=2.1.2
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.2
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.2
-SKIN_SUPPORT_VERSION=2.1.2
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.2
-SKIN_SUPPORT_CARDVIEW_VERSION=2.1.2
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.2
-SKIN_SUPPORT_DESIGN_VERSION=2.1.2
+MOGO_SKIN_SUPPORT_VERSION=2.1.4
+MOGO_SKIN_LIGHT_VERSION=2.1.4
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.4
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.4
+SKIN_SUPPORT_VERSION=2.1.4
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.4
+SKIN_SUPPORT_CARDVIEW_VERSION=2.1.4
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.4
+SKIN_SUPPORT_DESIGN_VERSION=2.1.4
 # OCH
-MOGO_OCH_VERSION=2.1.2-test
+MOGO_OCH_VERSION=2.1.4-test
 MOGO_OCH_BUS_VERSION=2.0.66
 MOGO_OCH_NOOP_VERSION=2.0.66
 MOGO_OCH_TAXI_VERSION=2.0.66
 # mogoAiCloud sdk services
-MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.2
+MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.4
 ################# 旧版本架构模块版本 #################
diff --git a/upload.sh b/upload.sh
index 981a9e2be8..f37cac23f5 100755
--- a/upload.sh
+++ b/upload.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 function upload(){
    ./gradlew $1:clean $1:uploadArchives
-   if [ $? -ne 0 ];then exit; fi
+   if [ $? -ne 0 ];the n exit; fi
 }
 
 for module in `cat modules.txt`;