From 1c4c7faa81ca9cf744290ee879f8569d5feec098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 16 Dec 2020 19:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/common/view/RoundLayout.java | 16 +-- modules/mogo-module-smp/build.gradle | 3 + .../src/main/AndroidManifest.xml | 2 +- .../src/main/assets/small_map_style.data | Bin 0 -> 141822 bytes .../main/assets/small_map_style_extra.data | Bin 0 -> 2734 bytes .../small/map/SmallMapDirectionView.java | 51 +++++++++- .../module/small/map/SmallMapService.java | 8 +- .../mogo/module/small/map/SmallMapView.java | 91 ------------------ .../map/TextureVideoViewOutlineProvider.java | 35 ------- ...module_small_map_view_my_location_logo.png | Bin 0 -> 2352 bytes .../drawable/module_small_map_view_border.xml | 4 + .../main/res/layout/module_small_map_view.xml | 8 +- .../src/main/res/values-xhdpi/dimens.xml | 4 +- 13 files changed, 72 insertions(+), 150 deletions(-) create mode 100644 modules/mogo-module-smp/src/main/assets/small_map_style.data create mode 100644 modules/mogo-module-smp/src/main/assets/small_map_style_extra.data delete mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapView.java delete mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/TextureVideoViewOutlineProvider.java create mode 100644 modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png create mode 100644 modules/mogo-module-smp/src/main/res/drawable/module_small_map_view_border.xml diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java index 23418c8b9e..20150f4a19 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java @@ -3,6 +3,8 @@ package com.mogo.module.common.view; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PaintFlagsDrawFilter; import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; @@ -19,11 +21,10 @@ import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; * desc : * version: 1.0 */ -public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSupportable { +public class RoundLayout extends RelativeLayout { private float roundLayoutRadius = 14f; private Path roundPath; private RectF rectF; - private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper; public RoundLayout(Context context) { this(context, null); @@ -41,9 +42,6 @@ public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSuppor typedArray.recycle(); init(); - - mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this); - mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr); } @@ -75,16 +73,10 @@ public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSuppor @Override public void draw(Canvas canvas) { if (roundLayoutRadius > 0f) { + canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG)); canvas.clipPath(roundPath); } super.draw(canvas); } - - @Override - public void applySkin() { - if (mBackgroundTintHelper != null) { - mBackgroundTintHelper.applySkin(); - } - } } diff --git a/modules/mogo-module-smp/build.gradle b/modules/mogo-module-smp/build.gradle index e3a46f8dd8..888a054935 100644 --- a/modules/mogo-module-smp/build.gradle +++ b/modules/mogo-module-smp/build.gradle @@ -38,6 +38,9 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter + + implementation rootProject.ext.dependencies.amapnavi3dmap + annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap diff --git a/modules/mogo-module-smp/src/main/AndroidManifest.xml b/modules/mogo-module-smp/src/main/AndroidManifest.xml index 649a2f531a..3d0a81ab9f 100644 --- a/modules/mogo-module-smp/src/main/AndroidManifest.xml +++ b/modules/mogo-module-smp/src/main/AndroidManifest.xml @@ -6,6 +6,6 @@ + /> \ No newline at end of file diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style.data b/modules/mogo-module-smp/src/main/assets/small_map_style.data new file mode 100644 index 0000000000000000000000000000000000000000..75195b39a29c1b139f8e5ce6b0e9c22c01de40b3 GIT binary patch literal 141822 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 WNB;zLckhb;0000 + + + \ No newline at end of file diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index b3703a522f..a5429f8ce3 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -1,5 +1,5 @@ - - @@ -26,4 +26,4 @@ android:layout_centerInParent="true" android:src="@drawable/module_small_map_view_border" /> - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml index 41d38e65b4..c09710af88 100644 --- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml @@ -3,8 +3,8 @@ 400px 400px - 300px - 300px + 260px + 260px 1490px 650px