diff --git a/config.gradle b/config.gradle index 8cbe49b6ab..4e70c4e1e4 100644 --- a/config.gradle +++ b/config.gradle @@ -19,196 +19,195 @@ targetSdkVersion : 22, ] dependencies = [ // androidx - androidxappcompat : "androidx.appcompat:appcompat:1.1.0", - androidxccorektx : "androidx.core:core-ktx:1.3.0", - androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3", - boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", - androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", - androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0", - androidxcardview : "androidx.cardview:cardview:1.0.0", - localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0", + androidxappcompat : "androidx.appcompat:appcompat:1.1.0", + androidxccorektx : "androidx.core:core-ktx:1.3.0", + androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3", + boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", + androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", + androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0", + androidxcardview : "androidx.cardview:cardview:1.0.0", + localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0", // flexbox - flexbox : 'com.google.android:flexbox:2.0.1', + 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", + junit : "junit:junit:4.12", + androidxjunit : "androidx.test.ext:junit:1.1.0", + androidxespressocore : "androidx.test.espresso:espresso-core:3.1.1", // 地图 - amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0", - amapsearch : "com.amap.api:search:7.1.0", - amaplocation : "com.amap.api:location:4.9.0", + amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0", + amapsearch : "com.amap.api:search:7.1.0", + amaplocation : "com.amap.api:location:4.9.0", // json 转换 - gson : "com.google.code.gson:gson:2.8.4", + gson : "com.google.code.gson:gson:2.8.4", // 内存泄漏检测 - debugleakcanary : "com.squareup.leakcanary:leakcanary-android:1.6.1", - releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1", - testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1", + debugleakcanary : "com.squareup.leakcanary:leakcanary-android:1.6.1", + releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1", + 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", + rxjava : "io.reactivex.rxjava2:rxjava:2.2.2", + rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.0", // arouter - arouter : "com.alibaba:arouter-api:1.5.0", - aroutercompiler : "com.alibaba:arouter-compiler:1.2.2", + arouter : "com.alibaba:arouter-api:1.5.0", + aroutercompiler : "com.alibaba:arouter-compiler:1.2.2", // glide - glide : 'com.github.bumptech.glide:glide:4.8.0', - glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0', - glideanno : 'com.github.bumptech.glide:annotations:4.8.0', - glidecompiler : 'com.github.bumptech.glide:compiler:4.8.0', - supportannos : "com.android.support:support-annotations:28.0.0", + glide : 'com.github.bumptech.glide:glide:4.8.0', + glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0', + glideanno : 'com.github.bumptech.glide:annotations:4.8.0', + glidecompiler : 'com.github.bumptech.glide:compiler:4.8.0', + supportannos : "com.android.support:support-annotations:28.0.0", // fresco - fresco : 'com.facebook.fresco:fresco:1.1.0', + fresco : 'com.facebook.fresco:fresco:1.1.0', // 公司服务 - 语音 - aiassist : "com.zhidaoauto.common:service:1.0.4.10", + aiassist : "com.zhidaoauto.common:service:1.0.4.10", // 语音替换方案 暂时只用TTS 解决焦点问题 - aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5", + aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5", // 公司服务 - 埋点 - analytics : "com.elegant.analytics:analytics:1.1.19", + analytics : "com.elegant.analytics:analytics:1.1.19", - retrofit : "com.squareup.retrofit2:retrofit:2.6.0", - retrofitadapter : "com.squareup.retrofit2:adapter-rxjava2:2.6.0", - retrofitconvertergson : "com.squareup.retrofit2:converter-gson:2.6.0", - retrofitconverterscalars : "com.squareup.retrofit2:converter-scalars:2.1.0", + retrofit : "com.squareup.retrofit2:retrofit:2.6.0", + retrofitadapter : "com.squareup.retrofit2:adapter-rxjava2:2.6.0", + retrofitconvertergson : "com.squareup.retrofit2:converter-gson:2.6.0", + retrofitconverterscalars : "com.squareup.retrofit2:converter-scalars:2.1.0", // leakcanary - leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4', - leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4', + leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4', + leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4', // add for room - room : "android.arch.persistence.room:runtime:1.1.1", - roomAnnotationProcessor : 'android.arch.persistence.room:compiler:1.1.1', + room : "android.arch.persistence.room:runtime:1.1.1", + roomAnnotationProcessor : 'android.arch.persistence.room:compiler:1.1.1', // rxjava2 with room - roomRxjava : "android.arch.persistence.room:rxjava2:1.1.1", + 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.1.0', - indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', + indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', // modules - moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}", - moduletanluapi : "com.mogo.module:module-tanlu-api:${MOGO_TANLU_API_VERSION}", - moduleshare : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}", - mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}", - mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}", - mapamap : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}", - mapautomap : "com.mogo.map:map-autonavi:${MAP_AUTONAVI_VERSION}", - mogomap : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}", - mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}", - modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}", - modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}", - modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}", - modulemainindependent : "com.mogo.module:module-main-independent:${MOGO_MODULE_MAIN_INDEPENDENT_VERSION}", - modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}", - moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}", - mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}", - mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", - moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", - mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}", - moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", - carcall : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}", - carcallprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}", - guideshow : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}", + moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}", + moduletanluapi : "com.mogo.module:module-tanlu-api:${MOGO_TANLU_API_VERSION}", + moduleshare : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}", + mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}", + mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}", + mapamap : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}", + mapautomap : "com.mogo.map:map-autonavi:${MAP_AUTONAVI_VERSION}", + mogomap : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}", + mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}", + modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}", + modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}", + modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}", + modulemainindependent : "com.mogo.module:module-main-independent:${MOGO_MODULE_MAIN_INDEPENDENT_VERSION}", + modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}", + moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}", + mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}", + mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", + moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", + mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}", + moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", + carcall : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}", + carcallprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}", + guideshow : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}", // guideshowprovider : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}", - // 在线车辆 - moduleonlinecar : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}", // V2X - moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}", - modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", - modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", + moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}", + modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", + modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", // push - modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}", - modulepushbase : "com.mogo.module:module-push-base:${MOGO_MODULE_PUSH_BASE_VERSION}", - modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}", - //运营位卡片 - moduleadcard : "com.mogo.module:module-adcard:${MOGO_MODULE_AD_CARD_VERSION}", + modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}", + modulepushbase : "com.mogo.module:module-push-base:${MOGO_MODULE_PUSH_BASE_VERSION}", + modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}", //统一返回键 - mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}", - mogomoduleauth : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}", - mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}", + mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}", + mogomoduleauth : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}", + mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}", // 长链 - socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.4', - socketsdkconnsvrprotoco : 'com.zhidao.ptech:connsvr-protoco:0.1.23', - socketsdkprotobufjava : 'com.google.protobuf:protobuf-java:3.5.1', + socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.4', + socketsdkconnsvrprotoco : 'com.zhidao.ptech:connsvr-protoco:0.1.23', + socketsdkprotobufjava : 'com.google.protobuf:protobuf-java:3.5.1', // OBU - moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}", + moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}", // - jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0", + jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0", // 统一登录 - accountsdk : "com.zhidao.accountservice:account-sdk:1.0.11", + accountsdk : "com.zhidao.accountservice:account-sdk:1.0.11", // crash - crashSdk : "com.zhidaoauto.crash.log:library:1.0.5", - kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}", + crashSdk : "com.zhidaoauto.crash.log:library:1.0.5", + kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}", //探路 - videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2", - videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", - videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", - eventbus : "org.greenrobot:eventbus:3.1.1", - videoprocessor : "com.zhidao.video:video-processor:1.0.2.1", + videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2", + videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", + videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", + eventbus : "org.greenrobot:eventbus:3.1.1", + videoprocessor : "com.zhidao.video:video-processor:1.0.2.1", - coroutinescore : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1", - coroutinesandroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1", + coroutinescore : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1", + coroutinesandroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1", - aspectj : "org.aspectj:aspectjrt:1.8.9", + aspectj : "org.aspectj:aspectjrt:1.8.9", // gps 模拟 - gpssimulator : "com.mogo.module:module-gps-simulator:${MOGO_MODULE_GPS_SIMULATOR_VERSION}", - gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", - gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", + gpssimulator : "com.mogo.module:module-gps-simulator:${MOGO_MODULE_GPS_SIMULATOR_VERSION}", + gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", + gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", - adasapi : "com.zhidao.autopilot.support:adas:1.0.1", - adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5", + adasapi : "com.zhidao.autopilot.support:adas:1.0.1", + adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5", // 个人中心的SDK - personalsdk : "com.zhidaoauto.person.info:data:1.0.1", - tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}", + personalsdk : "com.zhidaoauto.person.info:data:1.0.1", + tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}", // obu sdk - obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.1", - //事件面板 - moduleventpanel : "com.mogo.module:module-event-panel:${MOGO_MODULE_EVENT_PANEL_VERSION}", - // 事件面板空实现 - moduleventpanelnoop : "com.mogo.module:module-event-panel-noop:${MOGO_MODULE_EVENT_PANEL_VERSION}", + obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.1", // 左侧面板 - moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", + moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", // 左侧面板空实现 - moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}", + moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}", // 闪屏页 - modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}", + modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}", // 基础服务实现 - mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}", - mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}", + mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}", + mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}", // loglib - mogologlib : "com.mogo.module:module-loglib:${LOGLIB_VERSION}", + mogologlib : "com.mogo.module:module-loglib:${LOGLIB_VERSION}", // monitor - mogomonitor : "com.mogo.module:module-monitor:${MOGO_MODULE_MONITOR_VERSION}", + mogomonitor : "com.mogo.module:module-monitor:${MOGO_MODULE_MONITOR_VERSION}", // google - googlezxing : "com.google.zxing:core:3.3.3", - litezxing : "com.google.zxing:litezxing:1.0.29.8", + googlezxing : "com.google.zxing:core:3.3.3", + litezxing : "com.google.zxing:litezxing:1.0.29.8", // android - room - androidxroomruntime : "androidx.room:room-runtime:2.2.3", - androidxroomcompiler : "androidx.room:room-compiler:2.2.3", - androidxroomktx : "androidx.room:room-ktx:2.2.3", + androidxroomruntime : "androidx.room:room-runtime:2.2.3", + androidxroomcompiler : "androidx.room:room-compiler:2.2.3", + androidxroomktx : "androidx.room:room-ktx:2.2.3", // - mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}", + mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}", - kotlingradleplugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}", + kotlingradleplugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}", - skinsupport : "com.mogo.skin:skin-support:${MOGO_SKIN_SUPPORT_VERSION}", - skinsupportimpl : "com.mogo.skin:skin-support-impl:${MOGO_SKIN_SUPPORT_IMPL_VERSION}", - skinsupportnoop : "com.mogo.skin:skin-support-noop:${MOGO_SKIN_SUPPORT_NOOP_VERSION}", - skinsupportlight : "com.mogo.skin:skin-light:${MOGO_SKIN_LIGHT_VERSION}", + skinsupport : "com.mogo.skin:skin-support:${MOGO_SKIN_SUPPORT_VERSION}", + skinsupportimpl : "com.mogo.skin:skin-support-impl:${MOGO_SKIN_SUPPORT_IMPL_VERSION}", + skinsupportnoop : "com.mogo.skin:skin-support-noop:${MOGO_SKIN_SUPPORT_NOOP_VERSION}", + skinsupportlight : "com.mogo.skin:skin-light:${MOGO_SKIN_LIGHT_VERSION}", - crashreport : "com.mogo.test:crashrepot:${CRASHREPORT_VERSION}", - crashreportbugly : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}", - crashreportnoop : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}", + crashreport : "com.mogo.test:crashrepot:${CRASHREPORT_VERSION}", + crashreportbugly : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}", + crashreportnoop : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}", + + + skinsupportbase : "com.mogo.skin:skin-support-base:${SKIN_SUPPORT_VERSION}", + skinsupportappcompat : "com.mogo.skin:skin-support-appcompat:${SKIN_SUPPORT_APPCOMPAT_VERSION}", + skinsupportcardview : "com.mogo.skin:skin-support-cardview:${SKIN_SUPPORT_CARDVIEW_VERSION}", + skinsupportconstraintlayout: "com.mogo.skin:skin-support-constraint-layout:${SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION}", + skinsupportdesign : "com.mogo.skin:skin-support-designt:${SKIN_SUPPORT_DESIGN_VERSION}", ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0a7bd019ea..75dc085150 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,94 +29,83 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.1.22 -MOGO_UTILS_VERSION=1.2.1.22 -MAP_AMAP_VERSION=1.2.1.22 -MAP_AUTONAVI_VERSION=1.2.1.22 -MOGO_MAP_VERSION=1.2.1.22 -MOGO_MAP_API_VERSION=1.2.1.22 -MOGO_SERVICE_VERSION=1.2.1.22 -MOGO_SERVICE_API_VERSION=1.2.1.22 -MOGO_CONNECTION_VERSION=1.2.1.22 -MOGO_MODULE_APPS_VERSION=1.2.1.22 -MOGO_MODULE_NAVI_VERSION=1.2.1.22 -MOGO_MODULE_SHARE_VERSION=1.2.1.22 -MOGO_MODULE_COMMON_VERSION=1.2.1.22 -MOGO_MODULE_MAIN_VERSION=1.2.1.22 -MOGO_MODULE_MAP_VERSION=1.2.1.22 -MOGO_MODULE_SERVICE_VERSION=1.2.1.22 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.22 -MOGO_MODULE_SEARCH_VERSION=1.2.1.22 -MOGO_MODULE_BACK_VERSION=1.2.1.22 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.22 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.22 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.22 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.22 -MOGO_MODULE_GUIDE_VERSION=1.2.1.22 -MOGO_MODULE_MEDIA_VERSION=1.2.1.22 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.22 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.22 -MOGO_MODULE_V2X_VERSION=1.2.1.22 +MOGO_COMMONS_VERSION=2.0.0 +MOGO_UTILS_VERSION=2.0.0 +MAP_AMAP_VERSION=2.0.0 +MAP_AUTONAVI_VERSION=2.0.0 +MOGO_MAP_VERSION=2.0.0 +MOGO_MAP_API_VERSION=2.0.0 +MOGO_SERVICE_VERSION=2.0.0 +MOGO_SERVICE_API_VERSION=2.0.0 +MOGO_CONNECTION_VERSION=2.0.0 +MOGO_MODULE_APPS_VERSION=2.0.0 +MOGO_MODULE_NAVI_VERSION=2.0.0 +MOGO_MODULE_SHARE_VERSION=2.0.0 +MOGO_MODULE_COMMON_VERSION=2.0.0 +MOGO_MODULE_MAIN_VERSION=2.0.0 +MOGO_MODULE_MAP_VERSION=2.0.0 +MOGO_MODULE_SERVICE_VERSION=2.0.0 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.0 +MOGO_MODULE_SEARCH_VERSION=2.0.0 +MOGO_MODULE_BACK_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.0 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.0 +MOGO_MODULE_GUIDE_VERSION=2.0.0 +MOGO_MODULE_MEDIA_VERSION=2.0.0 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 2.0.0 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 2.0.0 +MOGO_MODULE_V2X_VERSION=2.0.0 # 基础服务实现：passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION = 1.2.1.22 -MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 - +MOGO_BASE_SERVICES_APK_VERSION = 2.0.0 +MOGO_BASE_SERVICES_SDK_VERSION = 2.0.0 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.24 +MOGO_MODULE_TANLU_VERSION=2.0.0 +# 视频引导 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.0 +# 推送 +MOGO_MODULE_PUSH_VERSION=2.0.0 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.0 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.0 +# 探路上报和分享模块 +TANLULIB_VERSION=2.0.0 +MOGO_TANLU_API_VERSION=2.0.0 +#左侧面板模块 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.0 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.0 +# 小控件 +MOGO_MODULE_WIDGETS_VERSION=2.0.0 +# obu +MOGO_MODULE_OBU_VERSION=2.0.0 +# 皮肤 +MOGO_SKIN_SUPPORT_VERSION=2.0.0 +MOGO_SKIN_LIGHT_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.0 +SKIN_SUPPORT_VERSION=2.0.0 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.0 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.0 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.0 +SKIN_SUPPORT_DESIGN_VERSION=2.0.0 +# 闪屏页 +MOGO_MODULE_SPLASH_VERSION=2.0.0 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.0 +# monitor +MOGO_MODULE_MONITOR_VERSION=2.0.0 +# bugly +CRASHREPORT_VERSION=2.0.0 +CRASHREPORT_BUGLY_VERSION=2.0.0 +CRASHREPORT_NOOP_VERSION=2.0.0 + +######## 外部依赖引用 # 车聊聊 CARCHATTING_VERSION=1.6.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 -# 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT -## 视频引导接口 - -MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT -# 在线车辆F -MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 -# 推送 -MOGO_MODULE_PUSH_VERSION=1.1.6.2 -MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 -MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 -# 广告资源位 -MOGO_MODULE_AD_CARD_VERSION=1.0.1 -# 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.24 -MOGO_TANLU_API_VERSION = 1.0.0-SNAPSHOT - -MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT -MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT -#左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION = 1.2.1.10-SNAPSHOT -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION = 1.2.1.10-SNAPSHOT -# 小控件 -MOGO_MODULE_WIDGETS_VERSION = 1.2.1.10-SNAPSHOT - -# Boost分包 -BOOST_MULTIDEX_VERSION=1.0.0 -# hook ARouter分包实现 -HOOKPLUGIN_VERSION=1.0.0 - -# obu -MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT - -# 闪屏页 -MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT -MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT -MOGO_SKIN_SUPPORT_VERSION=1.0.0 -MOGO_SKIN_LIGHT_VERSION=1.0.0 -MOGO_SKIN_SUPPORT_IMPL_VERSION=1.0.0 -MOGO_SKIN_SUPPORT_NOOP_VERSION=1.0.0 - # loglib LOGLIB_VERSION = 1.0.4 -# monitor -MOGO_MODULE_MONITOR_VERSION = 1.0.0-SNAPSHOT - -CRASHREPORT_VERSION = 1.0.0 -CRASHREPORT_BUGLY_VERSION = 1.0.0 -CRASHREPORT_NOOP_VERSION = 1.0.0 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 applicationId=com.mogo.launcer diff --git a/libraries/tanlulib/build.gradle b/libraries/tanlulib/build.gradle index de83c92c42..29c50539ec 100644 --- a/libraries/tanlulib/build.gradle +++ b/libraries/tanlulib/build.gradle @@ -49,9 +49,6 @@ dependencies { implementation 'com.zhidao.cosupload:cosuploadsdk:1.1.6' implementation 'com.zhidao.video:video-processor:1.0.2.1' implementation 'com.foundation.utils:common-utils:1.0.7' - - implementation rootProject.ext.dependencies.eventbus - compileOnly rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.eventbus implementation rootProject.ext.dependencies.coroutinescore implementation rootProject.ext.dependencies.coroutinesandroid @@ -60,9 +57,16 @@ dependencies { implementation rootProject.ext.dependencies.gson implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - compileOnly rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.aspectj implementation rootProject.ext.dependencies.analytics + + if (Boolean.valueOf(RELEASE)) { + compileOnly rootProject.ext.dependencies.mogocommons + compileOnly rootProject.ext.dependencies.mogomap + } else { + implementation project(':modules:mogo-module-common') + implementation project(':libraries:mogo-map') + } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java index 749ef4d10a..47b330bfd2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java @@ -13,7 +13,9 @@ import java.util.List; */ interface IOnlineCarPanelView extends IView { - void renderOnlineCarList( List< MarkerOnlineCar > onlineCars ); + void showLoading(boolean visible); + + void renderOnlineCarList( List< MarkerOnlineCar > onlineCars, double lon, double lat ); void renderEmptyUi( OnlineCarStrategy strategy ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index c003f218b7..9a6c35a81f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -33,9 +33,13 @@ import java.util.List; class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter.VH > { private List< MarkerOnlineCar > mDatums; + private double mToLon; + private double mToLat; - public OnlineCarPanelAdapter( List< MarkerOnlineCar > mDatums ) { + public OnlineCarPanelAdapter( List< MarkerOnlineCar > mDatums, double mToLon, double mToLat ) { this.mDatums = mDatums; + this.mToLon = mToLon; + this.mToLat = mToLat; } public void setDatums( List< MarkerOnlineCar > mDatums ) { @@ -51,7 +55,7 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter. @Override public void onBindViewHolder( @NonNull OnlineCarPanelAdapter.VH holder, int position ) { - holder.bind( mDatums.get( position ) ); + holder.bind( mDatums.get( position ), mToLon, mToLat ); } @Override @@ -77,26 +81,22 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter. detail = itemView.findViewById( R.id.module_services_id_panel_item_detail ); } - public void bind( MarkerOnlineCar car ) { + public void bind( MarkerOnlineCar car, double lon, double lat ) { RequestOptions options = new RequestOptions().circleCrop().placeholder( R.drawable.module_common_default_user_head ).error( R.drawable.module_common_default_user_head ); GlideApp.with( itemView.getContext() ).asBitmap().apply( options ).load( car.getUserInfo().getUserHead() ).into( new SkinAbleBitmapTarget( avatar, options ) ); nickname.setText( car.getUserInfo().getUserName() ); - String content = getDistanceStr( car.getLocation() ); + String content = getDistanceStr( car.getLocation(), lon, lat ); distance.setText( content ); detail.setOnClickListener( view -> { MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "Mogoer_List_click", null ); } ); } - private String getDistanceStr( MarkerLocation location ) { - MogoLocation mogoLocation = MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( itemView.getContext() ).getLastKnowLocation(); + private String getDistanceStr( MarkerLocation location, double lon, double lat ) { if ( location == null ) { - return ""; + return "未知"; } - if ( mogoLocation == null ) { - return ""; - } - float distance = Utils.calculateLineDistance( location.getLon(), location.getLat(), mogoLocation.getLongitude(), mogoLocation.getLatitude() ); + float distance = Utils.calculateLineDistance( location.getLon(), location.getLat(), lon, lat ); if ( distance >= 1000 ) { return String.format( "%.1fKM", distance / 1000 ); } else { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java index c425a3e37d..9a35ffedcd 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java @@ -1,6 +1,8 @@ package com.mogo.module.service.onlinecar.panel; import android.view.View; +import android.widget.ProgressBar; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; @@ -26,9 +28,15 @@ import java.util.Map; public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, OnlineCarPanelPresenter > implements IOnlineCarPanelView { private RecyclerView mList; - private View mRefreshPanel; private View mErrorPanel; + private View mRefreshPanel; + private TextView mEmptyTip; + private View m20KMStrategy; + private View m40KMStrategy; + + private ProgressBar mLoading; + private OnlineCarPanelAdapter mOnlineCarPanelAdapter; @Override @@ -44,8 +52,34 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On mList = findViewById( R.id.module_services_id_recycler_view ); mRefreshPanel = findViewById( R.id.module_services_id_load_strategy_container ); mErrorPanel = findViewById( R.id.module_services_id_error_container ); + m20KMStrategy = findViewById( R.id.module_services_id_20Km_radius ); + m40KMStrategy = findViewById( R.id.module_services_id_40Km_radius ); + mEmptyTip = findViewById( R.id.module_services_empty_tip ); + mLoading = findViewById( R.id.module_services_id_loading ); mList.setLayoutManager( new LinearLayoutManager( getContext(), LinearLayoutManager.VERTICAL, false ) ); + + m20KMStrategy.setOnClickListener( view -> { + mPresenter.nextStrategy(); + } ); + m40KMStrategy.setOnClickListener( view -> { + mPresenter.nextStrategy(); + } ); + mErrorPanel.setOnClickListener( view -> { + mPresenter.loadOnlineCar(); + } ); + } + + @Override + public void showLoading( boolean visible ) { + if ( visible ) { + mRefreshPanel.setVisibility( View.GONE ); + mList.setVisibility( View.GONE ); + mErrorPanel.setVisibility( View.GONE ); + mLoading.setVisibility( View.VISIBLE ); + } else { + mLoading.setVisibility( View.GONE ); + } } @NonNull @@ -55,12 +89,13 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On } @Override - public void renderOnlineCarList( List< MarkerOnlineCar > onlineCars ) { + public void renderOnlineCarList( List< MarkerOnlineCar > onlineCars, double lon, double lat ) { mRefreshPanel.setVisibility( View.GONE ); mErrorPanel.setVisibility( View.GONE ); mList.setVisibility( View.VISIBLE ); + mLoading.setVisibility( View.GONE ); if ( mOnlineCarPanelAdapter == null ) { - mOnlineCarPanelAdapter = new OnlineCarPanelAdapter( onlineCars ); + mOnlineCarPanelAdapter = new OnlineCarPanelAdapter( onlineCars, lon, lat ); mList.setAdapter( mOnlineCarPanelAdapter ); } else { mOnlineCarPanelAdapter.setDatums( onlineCars ); @@ -76,6 +111,24 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On mErrorPanel.setVisibility( View.GONE ); mList.setVisibility( View.GONE ); mRefreshPanel.setVisibility( View.VISIBLE ); + mLoading.setVisibility( View.GONE ); + + if ( strategy == null ) { + m20KMStrategy.setVisibility( View.GONE ); + m40KMStrategy.setVisibility( View.GONE ); + mEmptyTip.setText( getString( R.string.module_services_online_car_panel_empty_tmpl, OnlineCarStrategy.Strategy3.getRadiusKM() ) ); + } else { + switch ( strategy ) { + case Strategy3: + m20KMStrategy.setVisibility( View.GONE ); + m40KMStrategy.setVisibility( View.GONE ); + case Strategy2: + m20KMStrategy.setVisibility( View.GONE ); + case Default: + break; + } + mEmptyTip.setText( getString( R.string.module_services_online_car_panel_empty_tmpl, strategy.getRadiusKM() ) ); + } } @Override @@ -83,12 +136,14 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On mList.setVisibility( View.GONE ); mRefreshPanel.setVisibility( View.GONE ); mErrorPanel.setVisibility( View.VISIBLE ); + mLoading.setVisibility( View.GONE ); } @Override public void renderErrorUi() { mList.setVisibility( View.GONE ); mRefreshPanel.setVisibility( View.GONE ); + mLoading.setVisibility( View.GONE ); mErrorPanel.setVisibility( View.VISIBLE ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java index 44926e7c64..1602c21da7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java @@ -25,6 +25,8 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement private RefreshModel mRefreshModel; private OnlineCarStrategy mStrategy; private NavigationTargetInfo mNavigationTargetInfo; + private Double mToLat; + private Double mToLon; public OnlineCarPanelPresenter( IOnlineCarPanelView view ) { super( view ); @@ -44,14 +46,24 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement loadOnlineCar(); } + public void nextStrategy() { + if ( mStrategy != null ) { + mStrategy = mStrategy.getNext(); + } + if ( mStrategy != null ) { + loadOnlineCar(); + } + } + public void loadOnlineCar() { if ( mNavigationTargetInfo == null ) { return; } + mView.showLoading( true ); try { - double toLat = Double.valueOf( mNavigationTargetInfo.getToPoiLatitude() ); - double toLon = Double.valueOf( mNavigationTargetInfo.getToPoiLongitude() ); - mRefreshModel.queryOnLineCarWithRoute( new MogoLatLng( toLat, toLon ), + mToLat = Double.valueOf( mNavigationTargetInfo.getToPoiLatitude() ); + mToLon = Double.valueOf( mNavigationTargetInfo.getToPoiLongitude() ); + mRefreshModel.queryOnLineCarWithRoute( new MogoLatLng( mToLat, mToLon ), false, false, mStrategy.getRadius(), @@ -66,14 +78,13 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement @Override public void onSuccess( MarkerResponse o ) { - if ( o == null || o.getResult() == null ) { - mView.renderErrorUi(); + if ( o == null + || o.getResult() == null + || o.getResult().getOnlineCar() == null + || o.getResult().getOnlineCar().isEmpty() ) { + mView.renderEmptyUi( mStrategy ); } else { - if ( o.getResult().getOnlineCar() == null || o.getResult().getOnlineCar().isEmpty() ) { - mView.renderEmptyUi( mStrategy ); - } else { - mView.renderOnlineCarList( o.getResult().getOnlineCar() ); - } + mView.renderOnlineCarList( o.getResult().getOnlineCar(), mToLon, mToLat ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarStrategy.java index b80c4062aa..ffad8fc82a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarStrategy.java @@ -24,4 +24,12 @@ enum OnlineCarStrategy { public int getRadius() { return radius; } + + public int getRadiusKM() { + return radius / 1000; + } + + public OnlineCarStrategy getNext() { + return next; + } } diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 319d3bb6d1..9fa4b9aafb 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -29,6 +29,21 @@ android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" android:src="@drawable/module_services_close" /> + + 扩大到40KM半径 距离导航目的地 查看车友信息 + 很抱歉，目的地%dKM内未找到车友 diff --git a/skin/mogo-skin-support-impl/build.gradle b/skin/mogo-skin-support-impl/build.gradle index bff7a262ee..ece5dbcd54 100644 --- a/skin/mogo-skin-support-impl/build.gradle +++ b/skin/mogo-skin-support-impl/build.gradle @@ -39,25 +39,22 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler - // 换肤功能 -// implementation 'skin.support:skin-support:4.0.5' // skin-support -// implementation 'skin.support:skin-support-appcompat:4.0.5' // skin-support 基础控件支持 -// implementation 'skin.support:skin-support-design:4.0.5' // skin-support-design material design 控件支持[可选] -// implementation 'skin.support:skin-support-cardview:4.0.5' // skin-support-cardview CardView 控件支持[可选] -// implementation 'skin.support:skin-support-constraint-layout:4.0.5' // skin-support-constraint-layout ConstraintLayout 控件支持[可选] - - implementation project(":skin:skin-support") - api project(":skin:skin-support-appcompat") - implementation project(":skin:skin-support-cardview") - implementation project(":skin:skin-support-constraint-layout") - implementation project(":skin:skin-support-design") - if( Boolean.valueOf(RELEASE) ){ implementation rootProject.ext.dependencies.skinsupport compileOnly rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.skinsupportbase + implementation rootProject.ext.dependencies.skinsupportappcompat + implementation rootProject.ext.dependencies.skinsupportcardview + implementation rootProject.ext.dependencies.skinsupportconstraintlayout + implementation rootProject.ext.dependencies.skinsupportdesign } else { implementation project(":skin:mogo-skin-support") compileOnly project(':modules:mogo-module-common') + implementation project(":skin:skin-support") + implementation project(":skin:skin-support-appcompat") + implementation project(":skin:skin-support-cardview") + implementation project(":skin:skin-support-constraint-layout") + implementation project(":skin:skin-support-design") } } diff --git a/skin/skin-support-appcompat/build.gradle b/skin/skin-support-appcompat/build.gradle index 4942fd6be5..e09c0d3201 100755 --- a/skin/skin-support-appcompat/build.gradle +++ b/skin/skin-support-appcompat/build.gradle @@ -24,17 +24,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':skin:skin-support') implementation rootProject.ext.dependencies.androidxappcompat -} -tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - options.addStringOption('encoding', 'UTF-8') - options.addStringOption('charSet', 'UTF-8') -} - -ext { - moduleName = 'skin-support-appcompat' - descContent = 'skin-support 基础控件换肤支持包' + if( Boolean.valueOf(RELEASE) ){ + implementation rootProject.ext.dependencies.skinsupportbase + } else { + implementation project(":skin:skin-support") + } } \ No newline at end of file diff --git a/skin/skin-support-appcompat/gradle.properties b/skin/skin-support-appcompat/gradle.properties new file mode 100644 index 0000000000..ab3645e7fe --- /dev/null +++ b/skin/skin-support-appcompat/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.skin +POM_ARTIFACT_ID=skin-support-appcompat +VERSION_CODE=1 diff --git a/skin/skin-support-cardview/build.gradle b/skin/skin-support-cardview/build.gradle index 185d983c1f..f8f3cb5ce3 100755 --- a/skin/skin-support-cardview/build.gradle +++ b/skin/skin-support-cardview/build.gradle @@ -21,10 +21,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.androidxcardview - implementation project(':skin:skin-support') -} -ext { - moduleName = "skin-support-cardview" - descContent = "CardView-v7 换肤支持包" + if( Boolean.valueOf(RELEASE) ){ + implementation rootProject.ext.dependencies.skinsupportbase + } else { + implementation project(":skin:skin-support") + } } diff --git a/skin/skin-support-cardview/gradle.properties b/skin/skin-support-cardview/gradle.properties new file mode 100644 index 0000000000..752039f8a7 --- /dev/null +++ b/skin/skin-support-cardview/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.skin +POM_ARTIFACT_ID=skin-support-cardview +VERSION_CODE=1 diff --git a/skin/skin-support-constraint-layout/build.gradle b/skin/skin-support-constraint-layout/build.gradle index 801790ba81..b914ae28aa 100755 --- a/skin/skin-support-constraint-layout/build.gradle +++ b/skin/skin-support-constraint-layout/build.gradle @@ -22,10 +22,13 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation project(':skin:skin-support') implementation project(':skin:skin-support-appcompat') -} - -ext { - moduleName = 'skin-support-constraint-layout' - descContent = 'ConstraintLayout控件换肤支持包' + + if( Boolean.valueOf(RELEASE) ){ + implementation rootProject.ext.dependencies.skinsupportbase + implementation rootProject.ext.dependencies.skinsupportappcompat + } else { + implementation project(":skin:skin-support") + implementation project(":skin:skin-support-appcompat") + } } diff --git a/skin/skin-support-constraint-layout/gradle.properties b/skin/skin-support-constraint-layout/gradle.properties new file mode 100644 index 0000000000..d04ff62a59 --- /dev/null +++ b/skin/skin-support-constraint-layout/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.skin +POM_ARTIFACT_ID=skin-support-constraint-layout +VERSION_CODE=1 diff --git a/skin/skin-support-design/build.gradle b/skin/skin-support-design/build.gradle index 7864ce3c0a..e66847d5a4 100755 --- a/skin/skin-support-design/build.gradle +++ b/skin/skin-support-design/build.gradle @@ -21,11 +21,12 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.material - implementation project(':skin:skin-support') - implementation project(':skin:skin-support-appcompat') -} -ext { - moduleName = 'skin-support-design' - descContent = 'material design控件换肤支持包' + if( Boolean.valueOf(RELEASE) ){ + implementation rootProject.ext.dependencies.skinsupportbase + implementation rootProject.ext.dependencies.skinsupportappcompat + } else { + implementation project(":skin:skin-support") + implementation project(":skin:skin-support-appcompat") + } } diff --git a/skin/skin-support-design/gradle.properties b/skin/skin-support-design/gradle.properties new file mode 100644 index 0000000000..30288cd0d8 --- /dev/null +++ b/skin/skin-support-design/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.skin +POM_ARTIFACT_ID=skin-support-design +VERSION_CODE=1 diff --git a/skin/skin-support/build.gradle b/skin/skin-support/build.gradle index b3f218e0b3..dcb7dbe880 100755 --- a/skin/skin-support/build.gradle +++ b/skin/skin-support/build.gradle @@ -19,16 +19,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(":skin:mogo-skin-support") + if( Boolean.valueOf(RELEASE) ){ + implementation rootProject.ext.dependencies.skinsupport + } else { + implementation project(":skin:mogo-skin-support") + } } -tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - options.addStringOption('encoding', 'UTF-8') - options.addStringOption('charSet', 'UTF-8') -} - -ext { - moduleName = 'skin-support' - descContent = 'skin-support core' -} +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/skin/skin-support/gradle.properties b/skin/skin-support/gradle.properties new file mode 100644 index 0000000000..363e181caa --- /dev/null +++ b/skin/skin-support/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.skin +POM_ARTIFACT_ID=skin-support-base +VERSION_CODE=1 diff --git a/test/crashreport-noop/build.gradle b/test/crashreport-noop/build.gradle index 2ee98887fe..3f1cdbbea3 100644 --- a/test/crashreport-noop/build.gradle +++ b/test/crashreport-noop/build.gradle @@ -48,11 +48,6 @@ dependencies { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") } - - implementation 'com.tencent.bugly:crashreport:latest.release' - //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9 - implementation 'com.tencent.bugly:nativecrashreport:latest.release' - //其中latest.release指代最新Bugly NDK版本号，也可以指定明确的版本号，例如3.0 } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/upload.sh b/upload.sh index 025344b30a..90881e7093 100755 --- a/upload.sh +++ b/upload.sh @@ -6,6 +6,30 @@ if [ $? -ne 0 ];then exit; fi if [ $? -ne 0 ]; then exit; fi ./gradlew :libraries:mogo-map-api:clean :libraries:mogo-map-api:uploadArchives if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:mogo-skin-light:clean :skin:mogo-skin-light:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:mogo-skin-support:clean :skin:mogo-skin-support:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:mogo-skin-support-impl:clean :skin:mogo-skin-support-impl:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:mogo-skin-support-noop:clean :skin:mogo-skin-support-noop:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:skin-support:clean :skin:skin-support:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:skin-support-appcompat:clean :skin:skin-support-appcompat:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:skin-support-cardview:clean :skin:skin-support-cardview:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:skin-support-constraint-layout:clean :skin:skin-support-constraint-layout:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :skin:skin-support-design:clean :skin:skin-support-design:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :test:crashreport:clean :test:crashreport:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :test:crashreport-bugly:clean :test:crashreport-bugly:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :test:crashreport-noop:clean :test:crashreport-noop:uploadArchives +if [ $? -ne 0 ]; then exit; fi ./gradlew :services:mogo-service-api:clean :services:mogo-service-api:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :libraries:map-amap:clean :libraries:map-amap:uploadArchives @@ -70,4 +94,19 @@ if [ $? -ne 0 ]; then exit; fi if [ $? -ne 0 ]; then exit; fi ./gradlew :modules:mogo-module-push-noop:clean :modules:mogo-module-push-noop:uploadArchives if [ $? -ne 0 ]; then exit; fi -./gradlew :modules:mogo-module-push:clean :modules:mogo-module-push:uploadArchives \ No newline at end of file +./gradlew :modules:mogo-module-push:clean :modules:mogo-module-push:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :libraries:tanlulib:clean :libraries:tanlulib:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :libraries:mogo-tanlu-api:clean :libraries:mogo-tanlu-api:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :modules:mogo-module-monitor:clean :modules:mogo-module-monitor:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :modules:mogo-module-splash:clean :modules:mogo-module-splash:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :modules:mogo-module-splash-noop:clean :modules:mogo-module-splash-noop:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives +if [ $? -ne 0 ]; then exit; fi +./gradlew :modules:mogo-module-widgets:clean :modules:mogo-module-widgets:uploadArchives +if [ $? -ne 0 ]; then exit; fi \ No newline at end of file