From 3cc9fbe4bf4a05461866417728d75cc09de91f2b Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 4 Mar 2022 16:58:57 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E5=90=88=E5=B9=B6=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=88=B0=E5=9C=B0=E5=9B=BE=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- OCH/mogo-och-taxi-passenger/build.gradle | 2 - OCH/mogo-och-taxi/build.gradle | 2 - .../com/mogo/och/taxi/ui/OCHNaviFragment.java | 4 +- ZD_README/README_VersionHistory.md | 3 - config.gradle | 31 ------- .../mogo-core-function-main/build.gradle | 2 - .../mogo-core-function-map/build.gradle | 13 ++- .../mogo-core-function-map/consumer-rules.pro | 4 + .../function/smp/RoutePathConvertUtils.java | 0 .../function/smp/SmallMapDirectionView.java | 3 +- .../core/function/smp/SmallMapFragment.java | 1 + .../core/function/smp/SmpServiceManager.java | 0 .../animation/DirectionRotateAnimation.java | 0 .../smp/view/ISmallMapDirectionView.java | 0 .../module_small_map_view_dir_end.png | Bin .../module_small_map_view_dir_start.png | Bin .../module_small_map_view_end.png | Bin ...module_small_map_view_my_location_logo.png | Bin .../module_small_map_view_start.png | Bin .../icon_module_small_map_four_corners.png | Bin .../module_small_map_view_border.png | Bin .../module_small_map_view_border_north.png | Bin ...module_small_map_view_my_location_logo.png | Bin .../bg_module_small_map_view_border.xml | 0 .../res/layout/module_small_map_fragment.xml | 0 .../main/res/layout/module_small_map_view.xml | 0 .../src/main/res/values-xhdpi/dimens.xml | 6 ++ .../src/main/res/values/dimens.xml | 5 ++ .../mogo-core-function-smp/.gitignore | 1 - .../mogo-core-function-smp/build.gradle | 76 ------------------ .../mogo-core-function-smp/consumer-rules.pro | 4 - .../mogo-core-function-smp/gradle.properties | 3 - .../mogo-core-function-smp/proguard-rules.pro | 21 ----- .../src/main/AndroidManifest.xml | 5 -- .../res/values-xhdpi-2560x1440/dimens.xml | 8 -- .../src/main/res/values-xhdpi/dimens.xml | 8 -- .../src/main/assets/small_map_style.data | Bin .../main/assets/small_map_style_extra.data | Bin .../utilcode/mogo}/MapAssetStyleUtils.java | 2 +- gradle.properties | 45 +---------- modules.txt | 1 - settings.gradle | 1 - 42 files changed, 31 insertions(+), 220 deletions(-) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/RoutePathConvertUtils.java (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java (99%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java (99%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi/module_small_map_view_border.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/drawable/bg_module_small_map_view_border.xml (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/layout/module_small_map_fragment.xml (100%) rename core/function-impl/{mogo-core-function-smp => mogo-core-function-map}/src/main/res/layout/module_small_map_view.xml (100%) delete mode 100644 core/function-impl/mogo-core-function-smp/.gitignore delete mode 100644 core/function-impl/mogo-core-function-smp/build.gradle delete mode 100644 core/function-impl/mogo-core-function-smp/consumer-rules.pro delete mode 100644 core/function-impl/mogo-core-function-smp/gradle.properties delete mode 100644 core/function-impl/mogo-core-function-smp/proguard-rules.pro delete mode 100644 core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml delete mode 100644 core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml rename core/{function-impl/mogo-core-function-smp => mogo-core-res}/src/main/assets/small_map_style.data (100%) rename core/{function-impl/mogo-core-function-smp => mogo-core-res}/src/main/assets/small_map_style_extra.data (100%) rename core/{function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils => mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/MapAssetStyleUtils.java (96%) diff --git a/OCH/mogo-och-taxi-passenger/build.gradle b/OCH/mogo-och-taxi-passenger/build.gradle index 8b22040630..b38804a63d 100644 --- a/OCH/mogo-och-taxi-passenger/build.gradle +++ b/OCH/mogo-och-taxi-passenger/build.gradle @@ -59,7 +59,6 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_function_smp implementation rootProject.ext.dependencies.mogo_core_function_v2x }else { implementation project(":core:mogo-core-utils") @@ -67,7 +66,6 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') - implementation project(':core:function-impl:mogo-core-function-smp') implementation project(':core:function-impl:mogo-core-function-v2x') } } diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index 8b22040630..b38804a63d 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -59,7 +59,6 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_function_smp implementation rootProject.ext.dependencies.mogo_core_function_v2x }else { implementation project(":core:mogo-core-utils") @@ -67,7 +66,6 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') - implementation project(':core:function-impl:mogo-core-function-smp') implementation project(':core:function-impl:mogo-core-function-v2x') } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHNaviFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHNaviFragment.java index fa69f8c0db..8275d87bf7 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHNaviFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHNaviFragment.java @@ -6,14 +6,12 @@ import android.util.Log; import android.view.View; import com.amap.api.maps.AMap; -import com.amap.api.maps.model.BitmapDescriptorFactory; import com.amap.api.maps.model.CustomMapStyleOptions; -import com.amap.api.maps.model.MarkerOptions; import com.amap.api.navi.AMapNaviView; import com.amap.api.navi.AMapNaviViewListener; import com.amap.api.navi.AMapNaviViewOptions; import com.amap.api.navi.model.RouteOverlayOptions; -import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils; +import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils; import com.mogo.och.taxi.R; import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback; import com.mogo.och.taxi.model.NaviToDestinationModel; diff --git a/ZD_README/README_VersionHistory.md b/ZD_README/README_VersionHistory.md index 116e6ba841..56f59fab4a 100644 --- a/ZD_README/README_VersionHistory.md +++ b/ZD_README/README_VersionHistory.md @@ -74,11 +74,8 @@ moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_COMMONS moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_COMMONS_VERSION}", // 基础服务实现 mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_COMMONS_VERSION}", -mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_COMMONS_VERSION}", -mogobasewebsocketsdk : "com.mogo.base:websocket-sdk:${MOGO_COMMONS_VERSION}", mogowebsocket : "com.mogo.module.carchatting:module-carchatt-socket:${MOGO_COMMONS_VERSION}", mogologlib : "com.mogo.module:module-loglib:${MOGO_COMMONS_VERSION}", -mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_COMMONS_VERSION}", kotlingradleplugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${MOGO_COMMONS_VERSION}", skinsupport : "com.mogo.skin:skin-support:${MOGO_COMMONS_VERSION}", skinsupportimpl : "com.mogo.skin:skin-support-impl:${MOGO_COMMONS_VERSION}", diff --git a/config.gradle b/config.gradle index 0dce01414a..22df70a5de 100644 --- a/config.gradle +++ b/config.gradle @@ -136,13 +136,9 @@ ext { mogochainplugin : "com.mogo.cloud:hook:${HOOK_LOG_VERSION}", //========================= 旧版本架构 Maven 版本管理 ========================= - tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}", // modules - 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}", mapcustom : "com.mogo.map:map-custom:${MAP_CUSTOM_VERSION}", mogomap : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}", mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}", @@ -150,52 +146,25 @@ ext { mogocustommapoperational : "com.zhidaoauto.map:operational:${MAP_SDK_OPERATION_VERSION}", modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}", - modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_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}", - moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", chat : "com.mogo.module.carchatim:module-chat:${MOGO_MODULE_CHAT_VERSION}", callchat : "com.mogo.module.carchatim:module-carchatting:${MOGO_MODULE_CARCHATTING_VERSION}", callchatprovider : "com.mogo.module.carchatim:module-carchatting-provider:${MOGO_MODULE_CARCHATTINGPROVIDER_VERSION}", // V2X moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_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}", - // OBU - moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_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}", // 基础服务实现 - mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}", - mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}", - mogobasewebsocketsdk : "com.mogo.base:websocket-sdk:${MOGO_BASE_WEBSOCKET_SDK_VERSION}", mogowebsocket : "com.mogo.module.carchatting:module-carchatt-socket:${WEBSOCKET_VERSION}", mogologlib : "com.mogo.module:module-loglib:${LOGLIB_VERSION}", - mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_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}", crashreport : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}", crashreportbugly : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}", crashreportapmbyte : "com.mogo.test:crashreport-apmbyte:${CRASHREPORT_APMBYTE_VERSION}", crashreportnoop : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}", crashreportupgrade : "com.mogo.test:crashreport-upgrade:${CRASHREPORT_UPGRADE_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-design:${SKIN_SUPPORT_DESIGN_VERSION}", apm_insight : 'com.volcengine:apm_insight:1.4.4.cn', apm_insight_crash : 'com.volcengine:apm_insight_crash:1.4.2', diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index ae19924056..46450aada8 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -79,7 +79,6 @@ dependencies { api rootProject.ext.dependencies.mogo_core_data api rootProject.ext.dependencies.mogo_core_utils api rootProject.ext.dependencies.mogo_core_function_obu_mogo - api rootProject.ext.dependencies.mogo_core_function_smp api rootProject.ext.dependencies.mogo_core_function_hmi api rootProject.ext.dependencies.mogo_core_function_notice api rootProject.ext.dependencies.mogo_core_function_autopilot @@ -109,7 +108,6 @@ dependencies { api project(':core:mogo-core-data') api project(':core:mogo-core-utils') api project(':core:function-impl:mogo-core-function-obu-mogo') - api project(':core:function-impl:mogo-core-function-smp') api project(':core:function-impl:mogo-core-function-hmi') api project(':core:function-impl:mogo-core-function-autopilot') api project(':core:function-impl:mogo-core-function-check') diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index a3a65d41fa..dc7953c680 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -52,10 +52,15 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler //implementation rootProject.ext.dependencies.adasHigh implementation rootProject.ext.dependencies.mogocustommapoperational - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.amapnavi3dmap + implementation rootProject.ext.dependencies.amaplocation + + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { + implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogoserviceapi + + implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_api @@ -67,6 +72,7 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':services:mogo-service-api') + implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') @@ -74,7 +80,6 @@ dependencies { implementation project(":libraries:mogo-map") implementation project(":libraries:mogo-map-api") - implementation project(':libraries:mogo-adas') } } diff --git a/core/function-impl/mogo-core-function-map/consumer-rules.pro b/core/function-impl/mogo-core-function-map/consumer-rules.pro index e69de29bb2..b294e7f5c4 100644 --- a/core/function-impl/mogo-core-function-map/consumer-rules.pro +++ b/core/function-impl/mogo-core-function-map/consumer-rules.pro @@ -0,0 +1,4 @@ +-keep class com.mogo.module.small.map.*{*;} +-keep class com.android.internal.policy.MyPhoneLayoutInflater{*;} +-keep class com.amap.api.col.n3.*{*;} + diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/RoutePathConvertUtils.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/RoutePathConvertUtils.java similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/RoutePathConvertUtils.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/RoutePathConvertUtils.java diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java similarity index 99% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index a4fd036d2b..0b29881729 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -33,7 +33,8 @@ import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener; import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; -import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils; +import com.mogo.eagle.core.function.map.R; +import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils; import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.widget.RoundLayout; diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java similarity index 99% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index 0d21bb9335..ee0780a392 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -18,6 +18,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; +import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import org.jetbrains.annotations.NotNull; diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/drawable/bg_module_small_map_view_border.xml b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/drawable/bg_module_small_map_view_border.xml rename to core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml rename to core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_view.xml similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml rename to core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_view.xml diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml index 901ff994dc..5b648ef397 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml @@ -10,4 +10,10 @@ 390px 200px 200px + + 40px + 400px + 550px + 360px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml index 16c60e28c9..a4cebc3ea8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml @@ -10,4 +10,9 @@ 208px 100px 100px + + 30px + 288px + 450px + 260px \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/.gitignore b/core/function-impl/mogo-core-function-smp/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/function-impl/mogo-core-function-smp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/build.gradle b/core/function-impl/mogo-core-function-smp/build.gradle deleted file mode 100644 index 7934c350e5..0000000000 --- a/core/function-impl/mogo-core-function-smp/build.gradle +++ /dev/null @@ -1,76 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("AROUTER_MODULE_NAME", project.getName()) - } - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -dependencies { - - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - - implementation rootProject.ext.dependencies.amapnavi3dmap - implementation rootProject.ext.dependencies.amaplocation - - implementation rootProject.ext.dependencies.arouter - kapt rootProject.ext.dependencies.aroutercompiler - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.mogoserviceapi - - implementation rootProject.ext.dependencies.modulecommon - - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_function_call - } else { - api project(":foudations:mogo-commons") - api project(':services:mogo-service-api') - - implementation project(':modules:mogo-module-common') - - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-function-call') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/consumer-rules.pro b/core/function-impl/mogo-core-function-smp/consumer-rules.pro deleted file mode 100644 index b294e7f5c4..0000000000 --- a/core/function-impl/mogo-core-function-smp/consumer-rules.pro +++ /dev/null @@ -1,4 +0,0 @@ --keep class com.mogo.module.small.map.*{*;} --keep class com.android.internal.policy.MyPhoneLayoutInflater{*;} --keep class com.amap.api.col.n3.*{*;} - diff --git a/core/function-impl/mogo-core-function-smp/gradle.properties b/core/function-impl/mogo-core-function-smp/gradle.properties deleted file mode 100644 index 26b19ff567..0000000000 --- a/core/function-impl/mogo-core-function-smp/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.eagle.core.function.impl -POM_ARTIFACT_ID=smp -VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-smp/proguard-rules.pro b/core/function-impl/mogo-core-function-smp/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/function-impl/mogo-core-function-smp/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml deleted file mode 100644 index efe7036eb4..0000000000 --- a/core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 3c55bfcc33..0000000000 --- a/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 40px - 400px - 550px - 360px - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index 1bab67cb10..0000000000 --- a/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 30px - 288px - 450px - 260px - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style.data b/core/mogo-core-res/src/main/assets/small_map_style.data similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style.data rename to core/mogo-core-res/src/main/assets/small_map_style.data diff --git a/core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style_extra.data b/core/mogo-core-res/src/main/assets/small_map_style_extra.data similarity index 100% rename from core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style_extra.data rename to core/mogo-core-res/src/main/assets/small_map_style_extra.data diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java similarity index 96% rename from core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java index 6111bba679..58462276e1 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.smp.utils; +package com.mogo.eagle.core.utilcode.mogo; import android.content.Context; diff --git a/gradle.properties b/gradle.properties index 02525e9642..b789054ec5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -115,44 +115,17 @@ MOGO_CORE_NETWORK_VERSION=0.0.58.10 ################# 旧版本架构模块版本 ################# ## 工程内模块 MOGO_COMMONS_VERSION=2.1.16.10 -MOGO_UTILS_VERSION=2.1.16.10 MAP_AMAP_VERSION=2.1.16.10 -MAP_AUTONAVI_VERSION=2.1.16.10 MOGO_MAP_VERSION=2.1.16.10 MOGO_MAP_API_VERSION=2.1.16.10 MOGO_SERVICE_VERSION=2.1.16.10 MOGO_SERVICE_API_VERSION=2.1.16.10 -MOGO_CONNECTION_VERSION=2.1.16.10 -MOGO_MODULE_APPS_VERSION=2.1.16.10 -MOGO_MODULE_NAVI_VERSION=2.1.16.10 -MOGO_MODULE_SHARE_VERSION=2.1.16.10 MOGO_MODULE_COMMON_VERSION=2.1.16.10 -MOGO_MODULE_MAIN_VERSION=2.1.16.10 MOGO_MODULE_MAP_VERSION=2.1.16.10 MOGO_MODULE_SERVICE_VERSION=2.1.16.10 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.10 -MOGO_MODULE_SEARCH_VERSION=2.1.16.10 -MOGO_MODULE_BACK_VERSION=2.1.16.10 MOGO_MODULE_V2X_VERSION=2.1.16.10 -# 探路 -MOGO_MODULE_TANLU_VERSION=2.1.16.10 -# 推送 -MOGO_MODULE_PUSH_VERSION=2.1.16.10 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.10 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.10 -# 探路上报和分享模块 -TANLULIB_VERSION=2.1.16.10 -MOGO_TANLU_API_VERSION=2.1.16.10 -#左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.10 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.10 -# 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.16.10 # obu -MOGO_MODULE_OBU_VERSION=2.1.16.10 MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.10 -# monitor -MOGO_MODULE_MONITOR_VERSION=2.1.16.10 # bugly CRASHREPORT_VERSION=2.1.16.10 CRASHREPORT_BUGLY_VERSION=2.1.16.10 @@ -167,27 +140,13 @@ TTS_PAD_VERSION=2.1.16.10 TTS_NOOP_VERSION=2.1.16.10 # 自研地图 MAP_CUSTOM_VERSION=2.1.16.10 -MOGO_MODULE_ADAS_VERSION=2.1.16.10 -# 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.10 -MOGO_BASE_SERVICES_APK_VERSION=2.1.16.10 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.10 -MOGO_MODULE_CHAT_VERSION=2.1.16.10 + # 车聊聊 +MOGO_MODULE_CHAT_VERSION=2.1.16.10 MOGO_MODULE_CARCHATTING_VERSION=2.1.16.10 # 车聊聊接口 MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.10 -# 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.16.10 -MOGO_SKIN_LIGHT_VERSION=2.1.16.10 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.10 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.10 -SKIN_SUPPORT_VERSION=2.1.16.10 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.10 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.10 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.10 -SKIN_SUPPORT_DESIGN_VERSION=2.1.16.10 # OCH MOGO_OCH_VERSION=2.1.16.10-test MOGO_OCH_BUS_VERSION=2.0.66 diff --git a/modules.txt b/modules.txt index 6286ffa46c..22e495653a 100644 --- a/modules.txt +++ b/modules.txt @@ -26,7 +26,6 @@ :modules:mogo-module-service :core:function-impl:mogo-core-function-check :services:mogo-service -:core:function-impl:mogo-core-function-smp :core:function-impl:mogo-core-function-autopilot :core:function-impl:mogo-core-function-hmi :core:function-impl:mogo-core-function-map diff --git a/settings.gradle b/settings.gradle index 3186ff09e0..7cf69d91ce 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,6 @@ include ':core:function-impl:mogo-core-function-main' // UI 展示及交互 include ':core:function-impl:mogo-core-function-hmi' // 小地图控件 -include ':core:function-impl:mogo-core-function-smp' // 地图控件，HD-高精地图 include ':core:function-impl:mogo-core-function-map' // v2x预警业务，本地+云端预警