From 8866bcfaf7f124b61da0bfdf34f850feeb168c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 26 Aug 2021 13:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89=E8=A2=AB?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=9A=84=E5=B7=A5=E7=A8=8B=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml  |   2 -
 app/build.gradle  |   2 -
 gradle.properties | 138 +++++++++++++++++++++++-----------------------
 settings.gradle   |   2 -
 4 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0119683fbc..cfcf25df68 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -22,10 +22,8 @@
             <option value="$PROJECT_DIR$/foudations/httpdns-base" />
             <option value="$PROJECT_DIR$/foudations/httpdns-mogo" />
             <option value="$PROJECT_DIR$/foudations/httpdns-noop" />
-            <option value="$PROJECT_DIR$/foudations/httpdns-tencent" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-apk" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
-            <option value="$PROJECT_DIR$/foudations/mogo-base-websocket-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-commons" />
             <option value="$PROJECT_DIR$/foudations/mogo-utils" />
             <option value="$PROJECT_DIR$/libraries" />
diff --git a/app/build.gradle b/app/build.gradle
index f333b029e8..96e8645d4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,6 @@ dependencies {
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.modulecommon
-        implementation rootProject.ext.dependencies.mogobasewebsocketsdk
         implementation rootProject.ext.dependencies.modulesearch
         implementation rootProject.ext.dependencies.mogomoduleauth
         implementation rootProject.ext.dependencies.modulesplash
@@ -196,7 +195,6 @@ dependencies {
         implementation rootProject.ext.dependencies.httpdnsmogo
     } else {
         implementation project(':foudations:mogo-commons')
-        implementation project(':foudations:mogo-base-websocket-sdk')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-search')
         implementation project(':modules:mogo-module-authorize')
diff --git a/gradle.properties b/gradle.properties
index 9695df7068..081bfd5456 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -52,93 +52,93 @@ PASSWORD=xintai2018
 RELEASE=false
 # 模块版本
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.0.12
-MOGO_UTILS_VERSION=2.0.13
-MAP_AMAP_VERSION=2.0.12
-MAP_AUTONAVI_VERSION=2.0.12
-MOGO_MAP_VERSION=2.0.12
-MOGO_MAP_API_VERSION=2.0.13
-MOGO_SERVICE_VERSION=2.0.12
-MOGO_SERVICE_API_VERSION=2.0.14
-MOGO_CONNECTION_VERSION=2.0.12
-MOGO_MODULE_APPS_VERSION=2.0.12
-MOGO_MODULE_NAVI_VERSION=2.0.12
-MOGO_MODULE_SHARE_VERSION=2.0.12
-MOGO_MODULE_COMMON_VERSION=2.0.12
-MOGO_MODULE_MAIN_VERSION=2.0.12
-MOGO_MODULE_MAP_VERSION=2.0.12
-MOGO_MODULE_SERVICE_VERSION=2.0.12
-MOGO_MODULE_EXTENSIONS_VERSION=2.0.12
-MOGO_MODULE_SEARCH_VERSION=2.0.12
-MOGO_MODULE_BACK_VERSION=2.0.12
-MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.12
-MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.12
-MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.12
-MOGO_MODULE_AUTHORIZE_VERSION=2.0.12
-MOGO_MODULE_GUIDE_VERSION=2.0.12
-MOGO_MODULE_MEDIA_VERSION=2.0.12
-MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.12
-MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.12
-MOGO_MODULE_V2X_VERSION=2.0.12
+MOGO_COMMONS_VERSION=2.0.16
+MOGO_UTILS_VERSION=2.0.16
+MAP_AMAP_VERSION=2.0.16
+MAP_AUTONAVI_VERSION=2.0.16
+MOGO_MAP_VERSION=2.0.16
+MOGO_MAP_API_VERSION=2.0.16
+MOGO_SERVICE_VERSION=2.0.16
+MOGO_SERVICE_API_VERSION=2.0.16
+MOGO_CONNECTION_VERSION=2.0.16
+MOGO_MODULE_APPS_VERSION=2.0.16
+MOGO_MODULE_NAVI_VERSION=2.0.16
+MOGO_MODULE_SHARE_VERSION=2.0.16
+MOGO_MODULE_COMMON_VERSION=2.0.16
+MOGO_MODULE_MAIN_VERSION=2.0.16
+MOGO_MODULE_MAP_VERSION=2.0.16
+MOGO_MODULE_SERVICE_VERSION=2.0.16
+MOGO_MODULE_EXTENSIONS_VERSION=2.0.16
+MOGO_MODULE_SEARCH_VERSION=2.0.16
+MOGO_MODULE_BACK_VERSION=2.0.16
+MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.16
+MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.16
+MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.16
+MOGO_MODULE_AUTHORIZE_VERSION=2.0.16
+MOGO_MODULE_GUIDE_VERSION=2.0.16
+MOGO_MODULE_MEDIA_VERSION=2.0.16
+MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.16
+MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.16
+MOGO_MODULE_V2X_VERSION=2.0.16
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.12
-MOGO_BASE_SERVICES_APK_VERSION=2.0.12
-MOGO_BASE_SERVICES_SDK_VERSION=2.0.12
+MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.16
+MOGO_BASE_SERVICES_APK_VERSION=2.0.16
+MOGO_BASE_SERVICES_SDK_VERSION=2.0.16
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.0.12
+MOGO_MODULE_TANLU_VERSION=2.0.16
 # 视频引导
-MOGO_MODULE_GUIDESHOW_VERSION=2.0.12
+MOGO_MODULE_GUIDESHOW_VERSION=2.0.16
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.0.12
-MOGO_MODULE_PUSH_BASE_VERSION=2.0.12
-MOGO_MODULE_PUSH_NOOP_VERSION=2.0.12
+MOGO_MODULE_PUSH_VERSION=2.0.16
+MOGO_MODULE_PUSH_BASE_VERSION=2.0.16
+MOGO_MODULE_PUSH_NOOP_VERSION=2.0.16
 # 探路上报和分享模块
-TANLULIB_VERSION=2.0.12
-MOGO_TANLU_API_VERSION=2.0.12
+TANLULIB_VERSION=2.0.16
+MOGO_TANLU_API_VERSION=2.0.16
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.0.12
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.12
+MOGO_MODULE_LEFT_PANEL_VERSION=2.0.16
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.16
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.0.12
+MOGO_MODULE_WIDGETS_VERSION=2.0.16
 # obu
-MOGO_MODULE_OBU_VERSION=2.0.12
+MOGO_MODULE_OBU_VERSION=2.0.16
 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.0.12
-MOGO_SKIN_LIGHT_VERSION=2.0.12
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.12
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.12
-SKIN_SUPPORT_VERSION=2.0.12
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.12
-SKIN_SUPPORT_CARDVIEW_VERSION=2.0.12
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.12
-SKIN_SUPPORT_DESIGN_VERSION=2.0.12
+MOGO_SKIN_SUPPORT_VERSION=2.0.16
+MOGO_SKIN_LIGHT_VERSION=2.0.16
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.16
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.16
+SKIN_SUPPORT_VERSION=2.0.16
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.16
+SKIN_SUPPORT_CARDVIEW_VERSION=2.0.16
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.16
+SKIN_SUPPORT_DESIGN_VERSION=2.0.16
 # 闪屏页
-MOGO_MODULE_SPLASH_VERSION=2.0.12
-MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.12
+MOGO_MODULE_SPLASH_VERSION=2.0.16
+MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.16
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.0.12
+MOGO_MODULE_MONITOR_VERSION=2.0.16
 # bugly
-CRASHREPORT_VERSION=2.0.12
-CRASHREPORT_BUGLY_VERSION=2.0.12
-CRASHREPORT_NOOP_VERSION=2.0.12
-CRASHREPORT_UPGRADE_VERSION=2.0.12
+CRASHREPORT_VERSION=2.0.16
+CRASHREPORT_BUGLY_VERSION=2.0.16
+CRASHREPORT_NOOP_VERSION=2.0.16
+CRASHREPORT_UPGRADE_VERSION=2.0.16
 ## tts
-TTS_BASE_VERSION=2.0.12
-TTS_DI_VERSION=2.0.12
-TTS_ZHI_VERSION=2.0.12
-TTS_PAD_VERSION=2.0.12
-TTS_NOOP_VERSION=2.0.12
+TTS_BASE_VERSION=2.0.16
+TTS_DI_VERSION=2.0.16
+TTS_ZHI_VERSION=2.0.16
+TTS_PAD_VERSION=2.0.16
+TTS_NOOP_VERSION=2.0.16
 # 自研地图
-MAP_CUSTOM_VERSION=2.0.12
-#MOGO_MODULES_MVISION_VERSION=2.0.12
+MAP_CUSTOM_VERSION=2.0.16
+#MOGO_MODULES_MVISION_VERSION=2.0.16
 MOGO_MODULES_SMALL_MAP=1.0.0
 MOGO_MODULES_ADAS=1.0.0
 # httpdns
-HTTPDNS_TENCENT_VERSION = 2.0.12
-HTTPDNS_MOGO_VERSION=2.0.12
-HTTPDNS_BASE_VERSION = 2.0.13
-HTTPDNS_NOOP_VERSION = 2.0.12
+HTTPDNS_TENCENT_VERSION = 2.0.16
+HTTPDNS_MOGO_VERSION=2.0.16
+HTTPDNS_BASE_VERSION = 2.0.16
+HTTPDNS_NOOP_VERSION = 2.0.16
 
 # OCH
 MOGO_OCH_VERSION=1.0.0
diff --git a/settings.gradle b/settings.gradle
index e3b17fd80b..bfd518c330 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,9 +4,7 @@ include ':foudations:mogo-aicloud-services-apk'
 include ':foudations:httpdns-mogo'
 include ':modules:mogo-module-smp'
 include ':foudations:httpdns-base'
-include ':foudations:httpdns-tencent'
 include ':foudations:httpdns-noop'
-include ':foudations:mogo-base-websocket-sdk'
 include ':tts:tts-base'
 include ':tts:tts-di'
 include ':tts:tts-zhi'