yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级room

Browse Source
This commit is contained in:
董宏宇
2021-09-07 11:38:38 +08:00
parent 4b3133d412
commit 0aacdacb31
5 changed files with 85 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -29,7 +29,7 @@
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

14
config.gradle
View File

@@ -31,8 +31,8 @@ ext {
flexbox : 'com.google.android:flexbox:2.0.1',
// 测试
junit : "junit:junit:4.12",
androidxjunit : "androidx.test.ext:junit:1.1.0",
androidxespressocore : "androidx.test.espresso:espresso-core:3.1.1",
androidxjunit : "androidx.test.ext:junit:1.1.2",
androidxespressocore : "androidx.test.espresso:espresso-core:3.3.0",
// 地图
amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0",
amapsearch : "com.amap.api:search:7.1.0",
@@ -45,7 +45,7 @@ ext {
testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1",
//rxJava
rxjava : "io.reactivex.rxjava2:rxjava:2.2.2",
rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.0",
rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1",
// arouter
arouter : "com.alibaba:arouter-api:1.5.2",
aroutercompiler : "com.alibaba:arouter-compiler:1.5.2",
@@ -75,12 +75,6 @@ ext {
leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4',
leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4',
// add for room
room : 'androidx.room:room-runtime:2.0.0',
roomAnnotationProcessor : 'androidx.room:room-compiler:2.0.0',
// rxjava2 with room
roomRxjava : 'androidx.room:room-rxjava2:2.0.0',
// material
material : 'com.google.android.material:material:1.4.0',
@@ -195,6 +189,8 @@ ext {
androidxroomruntime : "androidx.room:room-runtime:2.2.3",
androidxroomcompiler : "androidx.room:room-compiler:2.2.3",
androidxroomktx : "androidx.room:room-ktx:2.2.3",
// rxjava2 with room
roomRxjava : 'androidx.room:room-rxjava2:2.2.3',
//
mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",

146
gradle.properties
View File

@@ -41,7 +41,7 @@ kapt.include.compile.classpath=false
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.jetifier.blacklist = ReactAndroid-processor.jar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
@@ -52,95 +52,95 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=2.0.54
MOGO_UTILS_VERSION=2.0.54
MAP_AMAP_VERSION=2.0.54
MAP_AUTONAVI_VERSION=2.0.54
MOGO_MAP_VERSION=2.0.54
MOGO_MAP_API_VERSION=2.0.54
MOGO_SERVICE_VERSION=2.0.54
MOGO_SERVICE_API_VERSION=2.0.54
MOGO_CONNECTION_VERSION=2.0.54
MOGO_MODULE_APPS_VERSION=2.0.54
MOGO_MODULE_NAVI_VERSION=2.0.54
MOGO_MODULE_SHARE_VERSION=2.0.54
MOGO_MODULE_COMMON_VERSION=2.0.54
MOGO_MODULE_MAIN_VERSION=2.0.54
MOGO_MODULE_MAP_VERSION=2.0.54
MOGO_MODULE_SERVICE_VERSION=2.0.54
MOGO_MODULE_EXTENSIONS_VERSION=2.0.54
MOGO_MODULE_SEARCH_VERSION=2.0.54
MOGO_MODULE_BACK_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.54
MOGO_MODULE_AUTHORIZE_VERSION=2.0.54
MOGO_MODULE_GUIDE_VERSION=2.0.54
MOGO_MODULE_MEDIA_VERSION=2.0.54
MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.54
MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.54
MOGO_MODULE_V2X_VERSION=2.0.54
MOGO_COMMONS_VERSION=2.0.56
MOGO_UTILS_VERSION=2.0.56
MAP_AMAP_VERSION=2.0.56
MAP_AUTONAVI_VERSION=2.0.56
MOGO_MAP_VERSION=2.0.56
MOGO_MAP_API_VERSION=2.0.56
MOGO_SERVICE_VERSION=2.0.56
MOGO_SERVICE_API_VERSION=2.0.56
MOGO_CONNECTION_VERSION=2.0.56
MOGO_MODULE_APPS_VERSION=2.0.56
MOGO_MODULE_NAVI_VERSION=2.0.56
MOGO_MODULE_SHARE_VERSION=2.0.56
MOGO_MODULE_COMMON_VERSION=2.0.56
MOGO_MODULE_MAIN_VERSION=2.0.56
MOGO_MODULE_MAP_VERSION=2.0.56
MOGO_MODULE_SERVICE_VERSION=2.0.56
MOGO_MODULE_EXTENSIONS_VERSION=2.0.56
MOGO_MODULE_SEARCH_VERSION=2.0.56
MOGO_MODULE_BACK_VERSION=2.0.56
MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.56
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.56
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.56
MOGO_MODULE_AUTHORIZE_VERSION=2.0.56
MOGO_MODULE_GUIDE_VERSION=2.0.56
MOGO_MODULE_MEDIA_VERSION=2.0.56
MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.56
MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.56
MOGO_MODULE_V2X_VERSION=2.0.56
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.54
MOGO_BASE_SERVICES_APK_VERSION=2.0.54
MOGO_BASE_SERVICES_SDK_VERSION=2.0.54
MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.56
MOGO_BASE_SERVICES_APK_VERSION=2.0.56
MOGO_BASE_SERVICES_SDK_VERSION=2.0.56
## 工程外部模块
# 探路
MOGO_MODULE_TANLU_VERSION=2.0.54
MOGO_MODULE_TANLU_VERSION=2.0.56
# 视频引导
MOGO_MODULE_GUIDESHOW_VERSION=2.0.54
MOGO_MODULE_GUIDESHOW_VERSION=2.0.56
# 推送
MOGO_MODULE_PUSH_VERSION=2.0.54
MOGO_MODULE_PUSH_BASE_VERSION=2.0.54
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.54
MOGO_MODULE_PUSH_VERSION=2.0.56
MOGO_MODULE_PUSH_BASE_VERSION=2.0.56
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.56
# 探路上报和分享模块
TANLULIB_VERSION=2.0.54
MOGO_TANLU_API_VERSION=2.0.54
TANLULIB_VERSION=2.0.56
MOGO_TANLU_API_VERSION=2.0.56
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.54
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.54
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.56
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.56
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.0.54
MOGO_MODULE_WIDGETS_VERSION=2.0.56
# obu
MOGO_MODULE_OBU_VERSION=2.0.54
MOGO_MODULE_OBU_MOGO_VERSION=2.0.54
MOGO_MODULE_OBU_VERSION=2.0.56
MOGO_MODULE_OBU_MOGO_VERSION=2.0.56
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.0.54
MOGO_SKIN_LIGHT_VERSION=2.0.54
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.54
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.54
SKIN_SUPPORT_VERSION=2.0.54
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.54
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.54
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.54
SKIN_SUPPORT_DESIGN_VERSION=2.0.54
MOGO_SKIN_SUPPORT_VERSION=2.0.56
MOGO_SKIN_LIGHT_VERSION=2.0.56
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.56
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.56
SKIN_SUPPORT_VERSION=2.0.56
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.56
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.56
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.56
SKIN_SUPPORT_DESIGN_VERSION=2.0.56
# 闪屏页
MOGO_MODULE_SPLASH_VERSION=2.0.54
MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.54
MOGO_MODULE_SPLASH_VERSION=2.0.56
MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.56
# monitor
MOGO_MODULE_MONITOR_VERSION=2.0.54
MOGO_MODULE_MONITOR_VERSION=2.0.56
# bugly
CRASHREPORT_VERSION=2.0.54
CRASHREPORT_BUGLY_VERSION=2.0.54
CRASHREPORT_NOOP_VERSION=2.0.54
CRASHREPORT_UPGRADE_VERSION=2.0.54
CRASHREPORT_VERSION=2.0.56
CRASHREPORT_BUGLY_VERSION=2.0.56
CRASHREPORT_NOOP_VERSION=2.0.56
CRASHREPORT_UPGRADE_VERSION=2.0.56
## tts
TTS_BASE_VERSION=2.0.54
TTS_DI_VERSION=2.0.54
TTS_ZHI_VERSION=2.0.54
TTS_PAD_VERSION=2.0.54
TTS_NOOP_VERSION=2.0.54
TTS_BASE_VERSION=2.0.56
TTS_DI_VERSION=2.0.56
TTS_ZHI_VERSION=2.0.56
TTS_PAD_VERSION=2.0.56
TTS_NOOP_VERSION=2.0.56
# 自研地图
MAP_CUSTOM_VERSION=2.0.54
MOGO_MODULE_SMP_VERSION=2.0.54
MOGO_MODULE_ADAS_VERSION=2.0.54
MAP_CUSTOM_VERSION=2.0.56
MOGO_MODULE_SMP_VERSION=2.0.56
MOGO_MODULE_ADAS_VERSION=2.0.56
# OCH
MOGO_OCH_VERSION=2.0.54
MOGO_OCH_BUS_VERSION=2.0.54
MOGO_OCH_NOOP_VERSION=2.0.54
MOGO_OCH_TAXI_VERSION=2.0.54
MOGO_OCH_VERSION=2.0.56
MOGO_OCH_BUS_VERSION=2.0.56
MOGO_OCH_NOOP_VERSION=2.0.56
MOGO_OCH_TAXI_VERSION=2.0.56
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.54
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.56
######## 外部依赖引用
# 车聊聊

4
modules/mogo-module-search/build.gradle
View File

@@ -42,8 +42,8 @@ dependencies {
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout
implementation rootProject.ext.dependencies.arouter
implementation rootProject.ext.dependencies.room
kapt rootProject.ext.dependencies.roomAnnotationProcessor
implementation rootProject.ext.dependencies.androidxroomruntime
kapt rootProject.ext.dependencies.androidxroomcompiler
implementation rootProject.ext.dependencies.roomRxjava
implementation rootProject.ext.dependencies.androidxrecyclerview
implementation rootProject.ext.dependencies.androidxcardview

8
modules/mogo-module-v2x/build.gradle
View File

@@ -66,7 +66,7 @@ dependencies {
implementation rootProject.ext.dependencies.videoarm64
implementation rootProject.ext.dependencies.videojava
kapt rootProject.ext.dependencies.roomAnnotationProcessor
kapt rootProject.ext.dependencies.androidxroomcompiler
kapt rootProject.ext.dependencies.aroutercompiler
api rootProject.ext.dependencies.mogoaicloudtrafficlive
@@ -87,9 +87,9 @@ dependencies {
}
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'
testImplementation rootProject.ext.dependencies.junit
androidTestImplementation rootProject.ext.dependencies.androidxjunit
androidTestImplementation rootProject.ext.dependencies.androidxespressocore
}
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()