From 98f6fe9422ffd7b5367d8d3cfd864fac5bdd8c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 3 Sep 2021 12:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Android=20sdk=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 10 +- gradle.properties | 143 +++++++++--------- modules.txt | 30 ++-- .../mogo/module/hmi/ui/MoGoWarningFragment.kt | 2 +- .../module/hmi/ui/widget/TrafficLightView.kt | 2 +- .../hmi/ui/widget/V2XNotificationView.kt | 2 +- .../SkinMaterialBottomNavigationView.java | 8 +- 7 files changed, 98 insertions(+), 99 deletions(-) diff --git a/config.gradle b/config.gradle index 4ad2a1893c..00345355fc 100644 --- a/config.gradle +++ b/config.gradle @@ -20,11 +20,11 @@ ext { dependencies = [ // androidx androidxappcompat : "androidx.appcompat:appcompat:1.1.0", - androidxccorektx : "androidx.core:core-ktx:1.3.0", - androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3", + androidxccorektx : "androidx.core:core-ktx:1.6.0", + androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0", boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", - androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0", + androidxrecyclerview : "androidx.recyclerview:recyclerview:1.2.0", androidxcardview : "androidx.cardview:cardview:1.0.0", localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0", // flexbox @@ -83,7 +83,7 @@ ext { roomRxjava : "android.arch.persistence.room:rxjava2:1.1.1", // material - material : 'com.google.android.material:material:1.1.0', + material : 'com.google.android.material:material:1.4.0', indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', @@ -131,7 +131,7 @@ ext { // OBU moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}", moduleobumogo : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_MOGO_VERSION}", - crashwarning : "com.mogo.module:module-crash-warning:1.1.0", + crashwarning : "com.mogo.module:module-crash-warning:1.1.0", // jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0", diff --git a/gradle.properties b/gradle.properties index b501ebc47f..a39167a995 100644 --- a/gradle.properties +++ b/gradle.properties @@ -52,94 +52,93 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.17 -MOGO_UTILS_VERSION=2.0.17 -MAP_AMAP_VERSION=2.0.17 -MAP_AUTONAVI_VERSION=2.0.17 -MOGO_MAP_VERSION=2.0.17 -MOGO_MAP_API_VERSION=2.0.17 -MOGO_SERVICE_VERSION=2.0.17 -MOGO_SERVICE_API_VERSION=2.0.17 -MOGO_CONNECTION_VERSION=2.0.17 -MOGO_MODULE_APPS_VERSION=2.0.17 -MOGO_MODULE_NAVI_VERSION=2.0.17 -MOGO_MODULE_SHARE_VERSION=2.0.17 -MOGO_MODULE_COMMON_VERSION=2.0.17 -MOGO_MODULE_MAIN_VERSION=2.0.17 -MOGO_MODULE_MAP_VERSION=2.0.17 -MOGO_MODULE_SERVICE_VERSION=2.0.17 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.17 -MOGO_MODULE_SEARCH_VERSION=2.0.17 -MOGO_MODULE_BACK_VERSION=2.0.17 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.17 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.17 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.17 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.17 -MOGO_MODULE_GUIDE_VERSION=2.0.17 -MOGO_MODULE_MEDIA_VERSION=2.0.17 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.17 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.17 -MOGO_MODULE_V2X_VERSION=2.0.17 +MOGO_COMMONS_VERSION=2.0.24 +MOGO_UTILS_VERSION=2.0.24 +MAP_AMAP_VERSION=2.0.24 +MAP_AUTONAVI_VERSION=2.0.24 +MOGO_MAP_VERSION=2.0.24 +MOGO_MAP_API_VERSION=2.0.24 +MOGO_SERVICE_VERSION=2.0.24 +MOGO_SERVICE_API_VERSION=2.0.24 +MOGO_CONNECTION_VERSION=2.0.24 +MOGO_MODULE_APPS_VERSION=2.0.24 +MOGO_MODULE_NAVI_VERSION=2.0.24 +MOGO_MODULE_SHARE_VERSION=2.0.24 +MOGO_MODULE_COMMON_VERSION=2.0.24 +MOGO_MODULE_MAIN_VERSION=2.0.24 +MOGO_MODULE_MAP_VERSION=2.0.24 +MOGO_MODULE_SERVICE_VERSION=2.0.24 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.24 +MOGO_MODULE_SEARCH_VERSION=2.0.24 +MOGO_MODULE_BACK_VERSION=2.0.24 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.24 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.24 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.24 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.24 +MOGO_MODULE_GUIDE_VERSION=2.0.24 +MOGO_MODULE_MEDIA_VERSION=2.0.24 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.24 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.24 +MOGO_MODULE_V2X_VERSION=2.0.24 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.17 -MOGO_BASE_SERVICES_APK_VERSION=2.0.17 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.17 +MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.24 +MOGO_BASE_SERVICES_APK_VERSION=2.0.24 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.24 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.17 +MOGO_MODULE_TANLU_VERSION=2.0.24 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.17 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.24 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.17 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.17 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.17 +MOGO_MODULE_PUSH_VERSION=2.0.24 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.24 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.24 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.17 -MOGO_TANLU_API_VERSION=2.0.17 +TANLULIB_VERSION=2.0.24 +MOGO_TANLU_API_VERSION=2.0.24 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.17 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.17 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.24 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.24 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.17 +MOGO_MODULE_WIDGETS_VERSION=2.0.24 # obu -MOGO_MODULE_OBU_VERSION=2.0.17 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.17 +MOGO_MODULE_OBU_VERSION=2.0.24 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.24 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.17 -MOGO_SKIN_LIGHT_VERSION=2.0.17 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.17 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.17 -SKIN_SUPPORT_VERSION=2.0.17 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.17 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.17 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.17 -SKIN_SUPPORT_DESIGN_VERSION=2.0.17 +MOGO_SKIN_SUPPORT_VERSION=2.0.24 +MOGO_SKIN_LIGHT_VERSION=2.0.24 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.24 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.24 +SKIN_SUPPORT_VERSION=2.0.24 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.24 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.24 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.24 +SKIN_SUPPORT_DESIGN_VERSION=2.0.24 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.17 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.17 +MOGO_MODULE_SPLASH_VERSION=2.0.24 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.24 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.17 +MOGO_MODULE_MONITOR_VERSION=2.0.24 # bugly -CRASHREPORT_VERSION=2.0.17 -CRASHREPORT_BUGLY_VERSION=2.0.17 -CRASHREPORT_NOOP_VERSION=2.0.17 -CRASHREPORT_UPGRADE_VERSION=2.0.17 +CRASHREPORT_VERSION=2.0.24 +CRASHREPORT_BUGLY_VERSION=2.0.24 +CRASHREPORT_NOOP_VERSION=2.0.24 +CRASHREPORT_UPGRADE_VERSION=2.0.24 ## tts -TTS_BASE_VERSION=2.0.17 -TTS_DI_VERSION=2.0.17 -TTS_ZHI_VERSION=2.0.17 -TTS_PAD_VERSION=2.0.17 -TTS_NOOP_VERSION=2.0.17 +TTS_BASE_VERSION=2.0.24 +TTS_DI_VERSION=2.0.24 +TTS_ZHI_VERSION=2.0.24 +TTS_PAD_VERSION=2.0.24 +TTS_NOOP_VERSION=2.0.24 # 自研地图 -MAP_CUSTOM_VERSION=2.0.17 -MOGO_MODULES_SMALL_MAP=1.0.0 -MOGO_MODULES_ADAS=1.0.0 - +MAP_CUSTOM_VERSION=2.0.24 +MOGO_MODULES_SMALL_MAP=2.0.24 +MOGO_MODULES_ADAS=2.0.24 # OCH -MOGO_OCH_VERSION=2.0.17 -MOGO_OCH_BUS_VERSION=2.0.17 -MOGO_OCH_NOOP_VERSION=2.0.17 -MOGO_OCH_TAXI_VERSION=2.0.17 +MOGO_OCH_VERSION=2.0.24 +MOGO_OCH_BUS_VERSION=2.0.24 +MOGO_OCH_NOOP_VERSION=2.0.24 +MOGO_OCH_TAXI_VERSION=2.0.24 ######## 外部依赖引用 # 车聊聊 diff --git a/modules.txt b/modules.txt index c7f75746d1..96520e94e8 100644 --- a/modules.txt +++ b/modules.txt @@ -1,35 +1,34 @@ :foudations:mogo-utils +:skin:mogo-skin-support :tts:tts-base :tts:tts-zhi -:tts:tts-di :tts:tts-pad -:tts:tts-noop -:foudations:mogo-commons -:foudations:mogo-aicloud-services-sdk :libraries:mogo-map-api :services:mogo-service-api -:libraries:map-amap -:libraries:map-autonavi -:libraries:map-custom -:libraries:mogo-map -:modules:mogo-module-common -:skin:mogo-skin-support +:foudations:mogo-aicloud-services-sdk +:foudations:mogo-commons +:tts:tts-di +:tts:tts-noop :skin:skin-support :skin:skin-support-appcompat :skin:skin-support-cardview :skin:skin-support-constraint-layout :skin:skin-support-design -:skin:mogo-skin-light +:libraries:map-amap +:libraries:map-autonavi +:libraries:map-custom +:libraries:mogo-map +:modules:mogo-module-common :skin:mogo-skin-support-impl :skin:mogo-skin-support-noop :test:crashreport :test:crashreport-bugly -:test:crashreport-upgrade :test:crashreport-noop -:services:mogo-service -:modules:mogo-module-adas +:skin:mogo-skin-light :modules:mogo-module-obu :modules:mogo-module-obu-mogo +:services:mogo-service +:modules:mogo-module-adas :modules:mogo-module-map :modules:mogo-module-smp :modules:mogo-module-apps @@ -40,8 +39,8 @@ :modules:mogo-module-search :modules:mogo-module-v2x :modules:mogo-module-back -:modules:mogo-module-hmi :modules:mogo-module-main +:main-extensions:mogo-module-main-independent :main-extensions:mogo-module-main-launcher :modules:mogo-module-left-panel :modules:mogo-module-left-panel-noop @@ -52,6 +51,7 @@ :modules:mogo-module-monitor :modules:mogo-module-tanlu :modules:mogo-module-widgets +:modules:mogo-module-hmi :OCH:mogo-och :OCH:mogo-och-bus :OCH:mogo-och-noop diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index 62a6e380af..081a99a54a 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -53,7 +53,7 @@ class MoGoWarningFragment : MvpFragment