From faf7438bb0b33a3c912ea1d7547d4f0c8b253762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 17 Dec 2020 14:21:38 +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=E7=9A=84=E6=8F=8F=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../small/map/SmallMapDelegateFactory.java | 66 ------------------- .../small/map/SmallMapDirectionView.java | 12 +++- .../bg_module_small_map_view_border.xml | 28 ++++++++ .../drawable/module_small_map_view_border.xml | 4 -- .../main/res/layout/module_small_map_view.xml | 11 +++- .../src/main/res/values-xhdpi/dimens.xml | 7 +- 6 files changed, 51 insertions(+), 77 deletions(-) delete mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDelegateFactory.java create mode 100644 modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml delete mode 100644 modules/mogo-module-smp/src/main/res/drawable/module_small_map_view_border.xml diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDelegateFactory.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDelegateFactory.java deleted file mode 100644 index 962be7d52f..0000000000 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDelegateFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.mogo.module.small.map; - -import android.content.Context; - -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.commons.debug.DebugConfig; -import com.mogo.map.IMogoMapApiBuilder; -import com.mogo.map.IMogoMapView; -import com.mogo.map.impl.automap.navi.AutoNaviClient; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.navi.IMogoAimless; -import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.search.drive.IMogoRoadSearch; -import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; -import com.mogo.map.search.poisearch.IMogoPoiSearch; -import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; -import com.mogo.map.search.traffic.IMogoTrafficSearch; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.utils.AppUtils; - -/** - * @author donghongyu - * @since 2020/12/14 - *

- * 描述 - */ -class SmallMapDelegateFactory { - - private static final String TAG = "MogoMapDelegateFactory"; - - private static IMogoMapApiBuilder sApiBuilder; - - private static IMogoMapApiBuilder getApiBuilder() { - if ( sApiBuilder == null ) { - synchronized ( SmallMapDelegateFactory.class ) { - if ( sApiBuilder == null ) { - sApiBuilder = ARouter.getInstance().navigation( IMogoMapApiBuilder.class ); - } - } - } - return sApiBuilder; - } - - - public static IMogoAimless getAimless( Context context ) { - return getApiBuilder().getAimless( context ); - } - - public static void createMapViewInstance( Context context ) { - getApiBuilder().createMapView( context ); - } - - public static void destroy() { - getApiBuilder().destroy(); - } - - public static IMogoMapView getMapView(Context context ) { - return getApiBuilder().getMapView( context ); - } - - public static IMogoTrafficSearch getTrafficSearch() { - return getApiBuilder().getTrafficSearch(); - } -} diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index dddd20e2fe..1eaedef6d3 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -20,6 +20,9 @@ import com.amap.api.maps.model.MyLocationStyle; import com.mogo.module.common.view.RoundLayout; import com.mogo.module.small.map.animation.DirectionRotateAnimation; +import java.io.InputStream; +import java.net.URL; + /** * 小地图的方向View * @@ -60,12 +63,15 @@ public class SmallMapDirectionView extends RoundLayout { mTextureMapView.onCreate(null); mAMap = mTextureMapView.getMap(); -// mAMap.setMapType(AMap.MAP_TYPE_NIGHT);//夜景地图，aMap是地图控制器对象。 + mAMap.setMapType(AMap.MAP_TYPE_NIGHT);//夜景地图，aMap是地图控制器对象。 + + URL small_map_style = getClass().getResource("/assets/small_map_style.data"); + URL small_map_style_extra = getClass().getResource("/assets/small_map_style_extra.data"); mAMap.setCustomMapStyle(new CustomMapStyleOptions() .setEnable(true) - .setStyleDataPath("file:///android_asset/small_map_style.data") - .setStyleExtraPath("file:///android_asset/small_map_style_extra.data") + .setStyleDataPath(small_map_style.getPath()) + .setStyleExtraPath(small_map_style_extra.getPath()) ); myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。 diff --git a/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml b/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml new file mode 100644 index 0000000000..46982d07c3 --- /dev/null +++ b/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-smp/src/main/res/drawable/module_small_map_view_border.xml b/modules/mogo-module-smp/src/main/res/drawable/module_small_map_view_border.xml deleted file mode 100644 index a8b409b1d1..0000000000 --- a/modules/mogo-module-smp/src/main/res/drawable/module_small_map_view_border.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ 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 a5429f8ce3..59c74ffedd 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 @@ -5,10 +5,17 @@ android:layout_height="@dimen/module_small_map_border_view_width" app:roundLayoutRadius="360dp"> + + + 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 c09710af88..461d5da465 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,11 @@ 400px 400px - 260px - 260px + 260px + 260px + + 250px + 250px 1490px 650px