Merge branch 'dev' into dev_custom_map

2020-07-30 11:05:29 +08:00
parent cb7855272c b437e2d1fd
commit 7355f492bf
80 changed files with 2574 additions and 509 deletions
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
    @Override
    public void onNaviMapMode( int mode ) {
        Logger.i( TAG, "mode=" + mode );
+        MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D );
    }

    @Override
--- a/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png