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

Update map version

Browse Source
This commit is contained in:
martindhy
2021-09-07 01:30:33 +08:00
parent fc5503de1d
commit ae6a736f2c
7 changed files with 97 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.idea/misc.xml generated
View File

@@ -11,34 +11,11 @@
<component name="DesignSurface"> <component name="DesignSurface">
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
<map> <map>
<entry key="../../../../../../layout/custom_preview.xml" value="0.390625" />
<entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" /> <entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" />
<entry key="OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml" value="0.1953125" /> <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
<entry key="modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml" value="0.273046875" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/camera_item_v2x_live_video.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml" value="0.27447916666666666" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml" value="0.27447916666666666" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/include_debug_panel.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml" value="0.27447916666666666" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="0.2953125" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="1.0" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" /> <entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.25" /> <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.25" />
<entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.28854166666666664" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml" value="0.359375" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml" value="0.359375" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml" value="0.359375" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml" value="0.33" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" /> <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml" value="0.33645833333333336" />
<entry key="modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml" value="0.17864583333333334" />
<entry key="modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml" value="0.315625" />
<entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" /> <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
<entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" /> <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
<entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" /> <entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" />
@@ -49,16 +26,10 @@
<entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml" value="0.5546876453218006" /> <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml" value="0.5546876453218006" />
<entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_remind.xml" value="0.35734252929687504" /> <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_remind.xml" value="0.35734252929687504" />
<entry key="modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml" value="0.28919677734374993" /> <entry key="modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml" value="0.28919677734374993" />
<entry key="modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml" value="0.25416666666666665" />
<entry key="modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml" value="0.3338541666666667" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml" value="0.2484375" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml" value="0.2484375" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml" value="0.2484375" />
<entry key="modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml" value="0.2838541666666667" />
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
</project> </project>

4
UploadMaven.bat Normal file
View File

@@ -0,0 +1,4 @@
@echo off
for /f "delims=" %%i in (modules.txt) do (
gradlew %%i:clean %%i:uploadArchives
)

2
build.gradle
View File

@@ -46,7 +46,7 @@ task clean(type: Delete) {
task cleanAll(type: Delete) { task cleanAll(type: Delete) {
group = "custom" group = "custom"
rootProject.allprojects { rootProject.allprojects {
println "delete ${it.buildDir}" //println "delete ${it.buildDir}"
delete it.buildDir delete it.buildDir
} }
} }

150
gradle.properties
View File

@@ -52,101 +52,101 @@ PASSWORD=xintai2018
RELEASE=false RELEASE=false
# 模块版本 # 模块版本
## 工程内模块 ## 工程内模块
MOGO_COMMONS_VERSION=2.0.50 MOGO_COMMONS_VERSION=2.0.54
MOGO_UTILS_VERSION=2.0.50 MOGO_UTILS_VERSION=2.0.54
MAP_AMAP_VERSION=2.0.50 MAP_AMAP_VERSION=2.0.54
MAP_AUTONAVI_VERSION=2.0.50 MAP_AUTONAVI_VERSION=2.0.54
MOGO_MAP_VERSION=2.0.50 MOGO_MAP_VERSION=2.0.54
MOGO_MAP_API_VERSION=2.0.50 MOGO_MAP_API_VERSION=2.0.54
MOGO_SERVICE_VERSION=2.0.50 MOGO_SERVICE_VERSION=2.0.54
MOGO_SERVICE_API_VERSION=2.0.50 MOGO_SERVICE_API_VERSION=2.0.54
MOGO_CONNECTION_VERSION=2.0.50 MOGO_CONNECTION_VERSION=2.0.54
MOGO_MODULE_APPS_VERSION=2.0.50 MOGO_MODULE_APPS_VERSION=2.0.54
MOGO_MODULE_NAVI_VERSION=2.0.50 MOGO_MODULE_NAVI_VERSION=2.0.54
MOGO_MODULE_SHARE_VERSION=2.0.50 MOGO_MODULE_SHARE_VERSION=2.0.54
MOGO_MODULE_COMMON_VERSION=2.0.50 MOGO_MODULE_COMMON_VERSION=2.0.54
MOGO_MODULE_MAIN_VERSION=2.0.50 MOGO_MODULE_MAIN_VERSION=2.0.54
MOGO_MODULE_MAP_VERSION=2.0.50 MOGO_MODULE_MAP_VERSION=2.0.54
MOGO_MODULE_SERVICE_VERSION=2.0.50 MOGO_MODULE_SERVICE_VERSION=2.0.54
MOGO_MODULE_EXTENSIONS_VERSION=2.0.50 MOGO_MODULE_EXTENSIONS_VERSION=2.0.54
MOGO_MODULE_SEARCH_VERSION=2.0.50 MOGO_MODULE_SEARCH_VERSION=2.0.54
MOGO_MODULE_BACK_VERSION=2.0.50 MOGO_MODULE_BACK_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.50 MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.50 MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.54
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.50 MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.54
MOGO_MODULE_AUTHORIZE_VERSION=2.0.50 MOGO_MODULE_AUTHORIZE_VERSION=2.0.54
MOGO_MODULE_GUIDE_VERSION=2.0.50 MOGO_MODULE_GUIDE_VERSION=2.0.54
MOGO_MODULE_MEDIA_VERSION=2.0.50 MOGO_MODULE_MEDIA_VERSION=2.0.54
MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.50 MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.54
MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.50 MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.54
MOGO_MODULE_V2X_VERSION=2.0.50 MOGO_MODULE_V2X_VERSION=2.0.54
# 基础服务实现：passport、socket、location # 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.50 MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.54
MOGO_BASE_SERVICES_APK_VERSION=2.0.50 MOGO_BASE_SERVICES_APK_VERSION=2.0.54
MOGO_BASE_SERVICES_SDK_VERSION=2.0.50 MOGO_BASE_SERVICES_SDK_VERSION=2.0.54
## 工程外部模块 ## 工程外部模块
# 探路 # 探路
MOGO_MODULE_TANLU_VERSION=2.0.50 MOGO_MODULE_TANLU_VERSION=2.0.54
# 视频引导 # 视频引导
MOGO_MODULE_GUIDESHOW_VERSION=2.0.50 MOGO_MODULE_GUIDESHOW_VERSION=2.0.54
# 推送 # 推送
MOGO_MODULE_PUSH_VERSION=2.0.50 MOGO_MODULE_PUSH_VERSION=2.0.54
MOGO_MODULE_PUSH_BASE_VERSION=2.0.50 MOGO_MODULE_PUSH_BASE_VERSION=2.0.54
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.50 MOGO_MODULE_PUSH_NOOP_VERSION=2.0.54
# 探路上报和分享模块 # 探路上报和分享模块
TANLULIB_VERSION=2.0.50 TANLULIB_VERSION=2.0.54
MOGO_TANLU_API_VERSION=2.0.50 MOGO_TANLU_API_VERSION=2.0.54
#左侧面板模块 #左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.50 MOGO_MODULE_LEFT_PANEL_VERSION=2.0.54
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.50 MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.54
# 小控件 # 小控件
MOGO_MODULE_WIDGETS_VERSION=2.0.50 MOGO_MODULE_WIDGETS_VERSION=2.0.54
# obu # obu
MOGO_MODULE_OBU_VERSION=2.0.50 MOGO_MODULE_OBU_VERSION=2.0.54
MOGO_MODULE_OBU_MOGO_VERSION=2.0.50 MOGO_MODULE_OBU_MOGO_VERSION=2.0.54
# 皮肤 # 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.0.50 MOGO_SKIN_SUPPORT_VERSION=2.0.54
MOGO_SKIN_LIGHT_VERSION=2.0.50 MOGO_SKIN_LIGHT_VERSION=2.0.54
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.50 MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.54
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.50 MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.54
SKIN_SUPPORT_VERSION=2.0.50 SKIN_SUPPORT_VERSION=2.0.54
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.50 SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.54
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.50 SKIN_SUPPORT_CARDVIEW_VERSION=2.0.54
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.50 SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.54
SKIN_SUPPORT_DESIGN_VERSION=2.0.50 SKIN_SUPPORT_DESIGN_VERSION=2.0.54
# 闪屏页 # 闪屏页
MOGO_MODULE_SPLASH_VERSION=2.0.50 MOGO_MODULE_SPLASH_VERSION=2.0.54
MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.50 MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.54
# monitor # monitor
MOGO_MODULE_MONITOR_VERSION=2.0.50 MOGO_MODULE_MONITOR_VERSION=2.0.54
# bugly # bugly
CRASHREPORT_VERSION=2.0.50 CRASHREPORT_VERSION=2.0.54
CRASHREPORT_BUGLY_VERSION=2.0.50 CRASHREPORT_BUGLY_VERSION=2.0.54
CRASHREPORT_NOOP_VERSION=2.0.50 CRASHREPORT_NOOP_VERSION=2.0.54
CRASHREPORT_UPGRADE_VERSION=2.0.50 CRASHREPORT_UPGRADE_VERSION=2.0.54
## tts ## tts
TTS_BASE_VERSION=2.0.50 TTS_BASE_VERSION=2.0.54
TTS_DI_VERSION=2.0.50 TTS_DI_VERSION=2.0.54
TTS_ZHI_VERSION=2.0.50 TTS_ZHI_VERSION=2.0.54
TTS_PAD_VERSION=2.0.50 TTS_PAD_VERSION=2.0.54
TTS_NOOP_VERSION=2.0.50 TTS_NOOP_VERSION=2.0.54
# 自研地图 # 自研地图
MAP_CUSTOM_VERSION=2.0.50 MAP_CUSTOM_VERSION=2.0.54
MOGO_MODULE_SMP_VERSION=2.0.50 MOGO_MODULE_SMP_VERSION=2.0.54
MOGO_MODULE_ADAS_VERSION=2.0.50 MOGO_MODULE_ADAS_VERSION=2.0.54
# OCH # OCH
MOGO_OCH_VERSION=2.0.50 MOGO_OCH_VERSION=2.0.54
MOGO_OCH_BUS_VERSION=2.0.50 MOGO_OCH_BUS_VERSION=2.0.54
MOGO_OCH_NOOP_VERSION=2.0.50 MOGO_OCH_NOOP_VERSION=2.0.54
MOGO_OCH_TAXI_VERSION=2.0.50 MOGO_OCH_TAXI_VERSION=2.0.54
# mogoAiCloud sdk services # mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.50 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.54
######## 外部依赖引用 ######## 外部依赖引用
# 车聊聊 # 车聊聊
CARCHATTING_VERSION=2.2.330 CARCHATTING_VERSION=2.2.337
# 车聊聊接口 # 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.11 CARCHATTINGPROVIDER_VERSION=1.1.16
# websocket # websocket
WEBSOCKET_VERSION=1.1.7 WEBSOCKET_VERSION=1.1.7
# loglib # loglib
@@ -171,7 +171,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46
MOGO_LOCATION_VERSION=1.1.46 MOGO_LOCATION_VERSION=1.1.46
# 自研地图 # 自研地图
MAP_SDK_VERSION=1.0.1-vr-1.0.6 MAP_SDK_VERSION=1.0.1-vr-1.0.8
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级

32
modules/mogo-module-service/build.gradle
View File

@@ -10,7 +10,6 @@ android {
versionCode Integer.valueOf(VERSION_CODE) versionCode Integer.valueOf(VERSION_CODE)
versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'
@@ -19,7 +18,6 @@ android {
arguments = [AROUTER_MODULE_NAME: project.getName()] arguments = [AROUTER_MODULE_NAME: project.getName()]
} }
} }
} }
buildTypes { buildTypes {
@@ -28,16 +26,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
compileOptions { compileOptions {
sourceCompatibility 1.8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility 1.8 targetCompatibility = JavaVersion.VERSION_1_8
} }
lintOptions {
abortOnError false
}
} }
dependencies { dependencies {
@@ -53,18 +45,18 @@ dependencies {
implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.androidxrecyclerview
if (Boolean.valueOf(RELEASE)) { if (Boolean.valueOf(RELEASE)) {
api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomap
api rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogomapapi
api rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogoutils
api rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.modulecommon
} else { } else {
api project(":libraries:mogo-map") implementation project(":libraries:mogo-map")
api project(":libraries:mogo-map-api") implementation project(":libraries:mogo-map-api")
api project(":foudations:mogo-utils") implementation project(":foudations:mogo-utils")
api project(":foudations:mogo-commons") implementation project(":foudations:mogo-commons")
api project(':services:mogo-service-api') implementation project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-common')
} }
} }

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

@@ -50,13 +50,13 @@ dependencies {
if (Boolean.valueOf(RELEASE)) { if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogoutils
api rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.modulecommon
implementation rootProject.ext.dependencies.mogomoduleauth implementation rootProject.ext.dependencies.mogomoduleauth
implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.moduleservice
} else { } else {
implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-utils")
api project(":foudations:mogo-commons") implementation project(":foudations:mogo-commons")
implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-common')
implementation project(':modules:mogo-module-authorize') implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-service')

1
upload.sh
View File

@@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
function upload(){ function upload(){
./gradlew $1:clean $1:uploadArchives ./gradlew $1:clean $1:uploadArchives
if [ $? -ne 0 ];then exit; fi if [ $? -ne 0 ];then exit; fi