diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
index 7f15ca0aaf..a91b156399 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.amap.api.maps.AMap;
import com.amap.api.maps.TextureMapView;
+import com.amap.api.maps.UiSettings;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
import com.mogo.eagle.core.data.map.CenterLine;
diff --git a/core/function-impl/mogo-core-function-map/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
index 5b671fdd3a..ebf1e540cd 100644
--- a/core/function-impl/mogo-core-function-map/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
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.smp;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP;
import android.content.Context;
+import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.location.Location;
import android.os.Bundle;
@@ -29,6 +30,9 @@ import com.amap.api.maps.model.Marker;
import com.amap.api.maps.model.MarkerOptions;
import com.amap.api.maps.model.Polyline;
import com.amap.api.maps.model.PolylineOptions;
+import com.amap.api.navi.AMapNaviView;
+import com.amap.api.navi.AMapNaviViewOptions;
+import com.amap.api.navi.model.RouteOverlayOptions;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
@@ -58,7 +62,7 @@ public class SmallMapDirectionView
public static final String TAG = "SmallMapDirectionView";
private RoundLayout rlSmallMapBorder;
- private TextureMapView mAMapNaviView;
+ private AMapNaviView mAMapNaviView;
private AMap mAMap;
private Marker mCarMarker;
private Marker mStartMarker;
@@ -112,12 +116,12 @@ public class SmallMapDirectionView
private void initAMapView() {
mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
mAMap = mAMapNaviView.getMap();
- // 关闭地图文字标注
- mAMap.showMapText(false);
+ // 地图文字标注
+ mAMap.showMapText(true);
// 设置导航地图模式,aMap是地图控制器对象。
- mAMap.setMapType(AMap.MAP_TYPE_NIGHT);
- // 关闭显示实时路况图层,aMap是地图控制器对象。
- mAMap.setTrafficEnabled(false);
+ mAMap.setMapType(AMap.MAP_TYPE_NORMAL);
+ // 显示实时路况图层,aMap是地图控制器对象。
+ mAMap.setTrafficEnabled(true);
// 设置 锚点 图标
mCarMarker = mAMap.addMarker(new MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo))
@@ -131,14 +135,40 @@ public class SmallMapDirectionView
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()));
+
+ AMapNaviViewOptions options = mAMapNaviView.getViewOptions();
+ //打开走过的路段自定义
+ options.setAfterRouteAutoGray(true);
+ //黑夜模式
+ options.setNaviNight(true);
+ //导航全程光柱
+ options.setTrafficBarEnabled(false);
+ //指南针
+ options.setCompassEnabled(false);
+ //自定义样式
+ RouteOverlayOptions routeOverlayOptions = new RouteOverlayOptions();
+ //自车车标
+ options.setCarBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_my_location_logo));
+ options.setFourCornersBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_navi_direction));
+ options.setStartPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_dir_start));
+// options.setWayPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.navi_way));
+ options.setEndPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_dir_end));
+ //驶过路段擦除
+ routeOverlayOptions.setPassRoute(BitmapFactory.decodeResource(getResources(), R.drawable.module_small_map_view_dir_pass_route));
+ options.setRouteOverlayOptions(routeOverlayOptions);
+ mAMapNaviView.setViewOptions(options);
// 设置自定义样式
mAMap.setCustomMapStyle(customMapStyleOptions);
+
//设置希望展示的地图缩放级别
mAMap.moveCamera(mCameraUpdate);
// 设置地图的样式
UiSettings uiSettings = mAMap.getUiSettings();
uiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
- uiSettings.setAllGesturesEnabled(false);// 所有手势
+ uiSettings.setAllGesturesEnabled(true);// 所有手势
+ uiSettings.setCompassEnabled(false);
+ //设置倾斜手势是否可用。
+ uiSettings.setTiltGesturesEnabled(true);
uiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮
uiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可
mAMap.setOnMapLoadedListener(() -> {
@@ -157,7 +187,7 @@ public class SmallMapDirectionView
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
- return true;
+ return false;
}
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png
new file mode 100644
index 0000000000..20411285a7
Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png differ
diff --git a/core/function-impl/mogo-core-function-map/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
old mode 100644
new mode 100755
index f030e6887d..38204c4e09
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png
new file mode 100644
index 0000000000..40521d0788
Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png differ
diff --git a/core/function-impl/mogo-core-function-map/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
old mode 100644
new mode 100755
index 9a7f520b33..e44f52a3c1
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png differ
diff --git a/core/function-impl/mogo-core-function-map/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
index 0fa8d310d8..a14430dd88 100644
--- a/core/function-impl/mogo-core-function-map/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
@@ -9,26 +9,24 @@
+ android:layout_centerInParent="true" />
+ android:layout_centerInParent="true">
-
-
-
-
+
+
+
+
-
+
+ android:src="@drawable/module_small_map_view_border_north"
+ android:visibility="gone" />
\ No newline at end of file
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 5b648ef397..2d9205f188 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
@@ -12,8 +12,8 @@
200px
40px
- 400px
+ 700px
550px
- 360px
+ 660px
\ 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 a4cebc3ea8..74dc5d134d 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
@@ -12,7 +12,7 @@
100px
30px
- 288px
+ 488px
450px
- 260px
+ 460px
\ No newline at end of file