diff --git a/.idea/misc.xml b/.idea/misc.xml index f452e9abaf..88ea928781 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,6 +49,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index d128f2a2bf..e6235b7ef5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -162,7 +162,7 @@ dependencies { implementation rootProject.ext.dependencies.moduleextensions implementation rootProject.ext.dependencies.modulemap implementation rootProject.ext.dependencies.moduleSmallMap - implementation rootProject.ext.dependencies.moduleobu + implementation rootProject.ext.dependencies.moduleobumogo implementation rootProject.ext.dependencies.moduleADAS implementation rootProject.ext.dependencies.mogomoduleback implementation rootProject.ext.dependencies.mogomodulewidgets diff --git a/config.gradle b/config.gradle index dceecd7fd9..4ad2a1893c 100644 --- a/config.gradle +++ b/config.gradle @@ -130,6 +130,8 @@ ext { mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}", // 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", // jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0", @@ -222,8 +224,6 @@ ext { ttspad : "com.mogo.tts:tts-pad:${TTS_ZHI_VERSION}", ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}", -// mogomodulemachinevision : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}", - mogooch : "com.mogo.och:och:${MOGO_OCH_VERSION}", mogoochbus : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}", mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}", diff --git a/gradle.properties b/gradle.properties index 615df1e20a..b501ebc47f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -52,94 +52,94 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -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 +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 # 基础服务实现：passport、socket、location -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_BASE_WEBSOCKET_SDK_VERSION = 2.0.17 +MOGO_BASE_SERVICES_APK_VERSION=2.0.17 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.17 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.16 +MOGO_MODULE_TANLU_VERSION=2.0.17 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.16 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.17 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.16 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.16 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.16 +MOGO_MODULE_PUSH_VERSION=2.0.17 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.17 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.17 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.16 -MOGO_TANLU_API_VERSION=2.0.16 +TANLULIB_VERSION=2.0.17 +MOGO_TANLU_API_VERSION=2.0.17 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.16 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.16 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.17 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.17 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.16 +MOGO_MODULE_WIDGETS_VERSION=2.0.17 # obu -MOGO_MODULE_OBU_VERSION=2.0.16 +MOGO_MODULE_OBU_VERSION=2.0.17 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.17 # 皮肤 -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_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_MODULE_SPLASH_VERSION=2.0.16 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.16 +MOGO_MODULE_SPLASH_VERSION=2.0.17 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.17 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.16 +MOGO_MODULE_MONITOR_VERSION=2.0.17 # bugly -CRASHREPORT_VERSION=2.0.16 -CRASHREPORT_BUGLY_VERSION=2.0.16 -CRASHREPORT_NOOP_VERSION=2.0.16 -CRASHREPORT_UPGRADE_VERSION=2.0.16 +CRASHREPORT_VERSION=2.0.17 +CRASHREPORT_BUGLY_VERSION=2.0.17 +CRASHREPORT_NOOP_VERSION=2.0.17 +CRASHREPORT_UPGRADE_VERSION=2.0.17 ## tts -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 +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 # 自研地图 -MAP_CUSTOM_VERSION=2.0.16 -#MOGO_MODULES_MVISION_VERSION=2.0.16 +MAP_CUSTOM_VERSION=2.0.17 MOGO_MODULES_SMALL_MAP=1.0.0 MOGO_MODULES_ADAS=1.0.0 # OCH -MOGO_OCH_VERSION=1.0.0 -MOGO_OCH_BUS_VERSION=1.0.0 -MOGO_OCH_NOOP_VERSION=1.0.0 -MOGO_OCH_TAXI_VERSION=1.0.0 +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 ######## 外部依赖引用 # 车聊聊 diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 65ca9d8346..825f47b24f 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -53,10 +53,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler -// api rootProject.ext.dependencies.amapnavi3dmap -// api rootProject.ext.dependencies.amapsearch -// api rootProject.ext.dependencies.amaplocation - if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogomapapi diff --git a/modules.txt b/modules.txt index 09a3ac9227..c7f75746d1 100644 --- a/modules.txt +++ b/modules.txt @@ -1,32 +1,37 @@ :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 -:tts:tts-di -:tts:tts-noop :libraries:mogo-map-api -:skin:skin-support -:skin:skin-support-appcompat -:skin:skin-support-cardview -:skin:skin-support-constraint-layout -:skin:skin-support-design :services:mogo-service-api :libraries:map-amap :libraries:map-autonavi :libraries:map-custom :libraries:mogo-map :modules:mogo-module-common +:skin:mogo-skin-support +:skin:skin-support +:skin:skin-support-appcompat +:skin:skin-support-cardview +:skin:skin-support-constraint-layout +:skin:skin-support-design +:skin:mogo-skin-light :skin:mogo-skin-support-impl :skin:mogo-skin-support-noop :test:crashreport :test:crashreport-bugly +:test:crashreport-upgrade :test:crashreport-noop -:skin:mogo-skin-light :services:mogo-service +:modules:mogo-module-adas :modules:mogo-module-obu +:modules:mogo-module-obu-mogo :modules:mogo-module-map +:modules:mogo-module-smp :modules:mogo-module-apps :modules:mogo-module-service :modules:mogo-module-authorize @@ -35,9 +40,8 @@ :modules:mogo-module-search :modules:mogo-module-v2x :modules:mogo-module-back +:modules:mogo-module-hmi :modules:mogo-module-main -:modules:mogo-module-guide -:main-extensions:mogo-module-main-independent :main-extensions:mogo-module-main-launcher :modules:mogo-module-left-panel :modules:mogo-module-left-panel-noop @@ -46,7 +50,9 @@ :modules:mogo-module-push :libraries:tanlulib :modules:mogo-module-monitor -:modules:mogo-module-splash -:modules:mogo-module-splash-noop :modules:mogo-module-tanlu -:modules:mogo-module-widgets \ No newline at end of file +:modules:mogo-module-widgets +:OCH:mogo-och +:OCH:mogo-och-bus +:OCH:mogo-och-noop +:OCH:mogo-och-taxi \ No newline at end of file diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index b5dc35c5e6..6c5fd53bfc 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -57,7 +57,6 @@ dependencies { implementation rootProject.ext.dependencies.mogoobu - api "com.mogo.libs:hook:1.0" if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomapapi diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index cd18676153..4709d95ef3 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -59,9 +59,6 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduleshare implementation rootProject.ext.dependencies.moduleservice - -// implementation rootProject.ext.dependencies.moduleventpanel -// implementation rootProject.ext.dependencies.mogomoduleauth } else { api project(":libraries:mogo-map-api") api project(":foudations:mogo-utils") @@ -70,8 +67,6 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-share') implementation project(':modules:mogo-module-service') -// implementation project(':modules:mogo-module-event-panel') -// implementation project(':modules:mogo-module-authorize') } } diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle index a1be0b0c2e..94a783e44a 100644 --- a/modules/mogo-module-obu/build.gradle +++ b/modules/mogo-module-obu/build.gradle @@ -39,9 +39,9 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.obusdk - implementation 'com.mogo.module:module-crash-warning:1.1.0' + implementation rootProject.ext.dependencies.crashwarning + if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.modulecommon } else { diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index 1c1221a11e..3542d7c14c 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -50,7 +50,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils - implementation rootProject.ext.dependencies.mogocommons + api rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogomoduleauth implementation rootProject.ext.dependencies.moduleservice diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index c6306b79c7..b2733d2785 100644 --- a/modules/mogo-module-v2x/build.gradle +++ b/modules/mogo-module-v2x/build.gradle @@ -76,21 +76,20 @@ dependencies { implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduleservice + implementation rootProject.ext.dependencies.moduleobu } else { implementation project(':libraries:mogo-map') implementation project(':foudations:mogo-utils') implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-service') + implementation project(':modules:mogo-module-obu') } annotationProcessor rootProject.ext.dependencies.aroutercompiler testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation project(':modules:mogo-module-obu') -// implementation rootProject.ext.dependencies.mebulaobu - } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle index a4ba62cf02..6bb76edc71 100644 --- a/services/mogo-service-api/build.gradle +++ b/services/mogo-service-api/build.gradle @@ -51,7 +51,8 @@ dependencies { api rootProject.ext.dependencies.mogoaicloudrealtime api rootProject.ext.dependencies.fresco - api 'com.mogo.module:module-crash-warning:1.1.0' + api rootProject.ext.dependencies.crashwarning + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomapapi api rootProject.ext.dependencies.skinsupport diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index 6c0a4d07b8..db7819a39f 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -42,14 +42,15 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.adasapi implementation rootProject.ext.dependencies.adasconfigapi - implementation project(':modules:mogo-module-adas') if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.moduleADAS api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi } else { + implementation project(':modules:mogo-module-adas') api project(":libraries:mogo-map") implementation project(":libraries:mogo-map-api") implementation project(":foudations:mogo-utils")