[Change]

合并小地图到地图模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

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')

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')
     }
 }

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.*{*;}
+

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;

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;

core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml

@@ -10,4 +10,10 @@
     <dimen name="module_map_display_overview_top_margin">390px</dimen>
     <dimen name="module_map_display_overview_bottom_margin">200px</dimen>
     <dimen name="module_map_display_overview_right_margin">200px</dimen>
+
+    <dimen name="module_small_map_padding">40px</dimen>
+    <dimen name="module_small_map_view_border_width">400px</dimen>
+    <dimen name="module_small_map_border_view_width">550px</dimen>
+    <dimen name="module_small_map_view_width">360px</dimen>
+
 </resources>

core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml

@@ -10,4 +10,9 @@
     <dimen name="module_map_display_overview_top_margin">208px</dimen>
     <dimen name="module_map_display_overview_bottom_margin">100px</dimen>
     <dimen name="module_map_display_overview_right_margin">100px</dimen>
+
+    <dimen name="module_small_map_padding">30px</dimen>
+    <dimen name="module_small_map_view_border_width">288px</dimen>
+    <dimen name="module_small_map_border_view_width">450px</dimen>
+    <dimen name="module_small_map_view_width">260px</dimen>
 </resources>

core/function-impl/mogo-core-function-smp/.gitignore

@@ -1 +0,0 @@
-/build

core/function-impl/mogo-core-function-smp/build.gradle

@@ -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()

core/function-impl/mogo-core-function-smp/consumer-rules.pro

@@ -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.*{*;}
-

core/function-impl/mogo-core-function-smp/gradle.properties

@@ -1,3 +0,0 @@
-GROUP=com.mogo.eagle.core.function.impl
-POM_ARTIFACT_ID=smp
-VERSION_CODE=1

core/function-impl/mogo-core-function-smp/proguard-rules.pro

@@ -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

core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.eagle.core.function.smp">
-
-</manifest>

core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java

@@ -1,61 +0,0 @@
-package com.mogo.eagle.core.function.smp.utils;
-
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author donghongyu
- * @date 12/18/20 5:37 PM
- */
-public class MapAssetStyleUtils {
-
-    public static byte[] getAssetsStyle(Context context) {
-        byte[] buffer1 = null;
-        InputStream is1 = null;
-        try {
-            is1 = context.getResources().getAssets().open("small_map_style.data");
-            int lenght1 = is1.available();
-            buffer1 = new byte[lenght1];
-            is1.read(buffer1);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (is1 != null) {
-                    is1.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return buffer1;
-    }
-
-
-    public static byte[] getAssetsExtraStyle(Context context) {
-        byte[] buffer1 = null;
-        InputStream is1 = null;
-        try {
-            is1 = context.getResources().getAssets().open("small_map_style_extra.data");
-            int lenght1 = is1.available();
-            buffer1 = new byte[lenght1];
-            is1.read(buffer1);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (is1 != null) {
-                    is1.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return buffer1;
-    }
-
-
-}

core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_small_map_padding">40px</dimen>
-    <dimen name="module_small_map_view_border_width">400px</dimen>
-    <dimen name="module_small_map_border_view_width">550px</dimen>
-    <dimen name="module_small_map_view_width">360px</dimen>
-
-</resources>

core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_small_map_padding">30px</dimen>
-    <dimen name="module_small_map_view_border_width">288px</dimen>
-    <dimen name="module_small_map_border_view_width">450px</dimen>
-    <dimen name="module_small_map_view_width">260px</dimen>
-
-</resources>