升级Android sdk版本

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",

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
 
 ######## 外部依赖引用
 # 车聊聊

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

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt

@@ -53,7 +53,7 @@ class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresent
 
         activity?.let {
 
-            val notificationView = V2XNotificationView(activity)
+            val notificationView = V2XNotificationView(it)
             notificationView.setWarningIcon(WarningTypeEnum.getWarningIcon(v2xType))
 
             notificationView.setWarningContent(

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/TrafficLightView.kt

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
  * 红绿灯控件
  */
 class TrafficLightView @JvmOverloads constructor(
-    context: Context?,
+    context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XNotificationView.kt

@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.notification_v2x_msg_vr.view.*
  *@date          2021/8/6 12:25 下午
  */
 class V2XNotificationView @JvmOverloads constructor(
-    context: Context?,
+    context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {

skin/skin-support-design/src/main/java/skin/support/design/widget/SkinMaterialBottomNavigationView.java

@@ -48,13 +48,13 @@ public class SkinMaterialBottomNavigationView extends BottomNavigationView imple
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BottomNavigationView, defStyleAttr,
                 R.style.Widget_Design_BottomNavigationView);
 
-        if (a.hasValue(R.styleable.BottomNavigationView_itemIconTint)) {
-            mIconTintResId = a.getResourceId(R.styleable.BottomNavigationView_itemIconTint, INVALID_ID);
+        if (a.hasValue(R.styleable.NavigationBarView_itemIconTint)) {
+            mIconTintResId = a.getResourceId(R.styleable.NavigationBarView_itemIconTint, INVALID_ID);
         } else {
             mDefaultTintResId = resolveColorPrimary();
         }
-        if (a.hasValue(R.styleable.BottomNavigationView_itemTextColor)) {
-            mTextColorResId = a.getResourceId(R.styleable.BottomNavigationView_itemTextColor, INVALID_ID);
+        if (a.hasValue(R.styleable.NavigationBarView_itemTextColor)) {
+            mTextColorResId = a.getResourceId(R.styleable.NavigationBarView_itemTextColor, INVALID_ID);
         } else {
             mDefaultTintResId = resolveColorPrimary();
         }