diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 825fa0dd8b..50d339215b 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -39,5 +39,7 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" + // 默认进入的地图模式 + buildConfigField 'int', 'MAP_STYLE_MODE', "1" } } \ No newline at end of file diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 9b2b9c47d3..e53772a855 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -94,15 +94,19 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView( Context context ) { Log.d(TAG,"setDebugMode==true"); - NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() - .setDebugMode( false ) -// .setDataFileSource(1) //todo 1-使用本地地图数据,0-使用在线地图数据 + + MapParams mapParams = MapParams.Companion.init(); + mapParams.setDebugMode( false ) + // .setDataFileSource(1) //todo 1-使用本地地图数据,0-使用在线地图数据 .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) -// .setZoom( 20 ) -// .setPointToCenter( 0.734375f, 0.5f ) + // .setZoom( 20 ) + // .setPointToCenter( 0.734375f, 0.5f ) .setPointToCenter( 0.5f, 0.5f ) //todo 2D模式下需要注意ADAS部分遮挡 - .setStyleMode( MapParams.MAP_STYLE_VR ), NavParams.Companion.init() ); + .setStyleMode( MapParams.MAP_STYLE_VR ); + + + NavAutoApi.INSTANCE.init( context, mapParams, NavParams.Companion.init()); MapAutoView mapAutoView = new MapAutoView(context); IMogoMapView mapView = new AMapViewWrapper(mapAutoView); return mapView; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 736241ed6f..6458a25ed5 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -743,12 +743,10 @@ public class EntranceFragment extends MvpFragment