diff --git a/app/build.gradle b/app/build.gradle index 75e6632d5b..1a334259e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -259,6 +259,7 @@ dependencies { releaseImplementation rootProject.ext.dependencies.releaseleakcanary implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.lancetx_runtime + implementation rootProject.ext.dependencies.mogocustommap // // 暂不使用Shizuku-API // implementation rootProject.ext.dependencies.shizuku_provider diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index d2e073d14b..39df71a250 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -3,9 +3,11 @@ package com.mogo.launcher; import android.content.Context; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.main.MainMoGoApplication; import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.launcher.crash.CrashSystem; import com.mogo.launcher.stageone.APMStartup; import com.mogo.launcher.stageone.ARouterStartUp; @@ -15,6 +17,9 @@ import com.rousetime.android_startup.StartupListener; import com.rousetime.android_startup.StartupManager; import com.rousetime.android_startup.model.LoggerLevel; import com.rousetime.android_startup.model.StartupConfig; +import com.zhidaoauto.map.sdk.open.HDTypes; +import com.zhidaoauto.map.sdk.open.MapAutoApi; +import com.zhidaoauto.map.sdk.open.MapParams; import org.greenrobot.eventbus.EventBus; @@ -28,6 +33,39 @@ public class MogoApplication extends MainMoGoApplication { @Override public void onCreate() { + MapParams mapParams = MapParams.Companion.init(); + mapParams.setDebugMode(false) + //todo 1-使用本地地图数据,0-使用在线地图数据 + //.setDataFileSource(1) + .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) + .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR) + .setHDVisibileArray(new int[]{HDTypes.DIVIDER.type, + HDTypes.ROAD_AREA.type, + HDTypes.STOP_LINE.type, + HDTypes.ARROW.type, + HDTypes.STATION_BRIDGE.type, + HDTypes.ZEBRA_LINE.type, + HDTypes.GREEN_BELT.type, + HDTypes.DIVERSION.type, + HDTypes.SAFE_ISLAND.type, + HDTypes.ALPHANUMERIC.type, + HDTypes.GUARDBAR.type, + HDTypes.TRAFFIC_DEVICE.type, + HDTypes.CABLE.type, + HDTypes.SIGNAL_LINE.type}); + // .setZoom( 20 ) + // .setPointToCenter( 0.734375f, 0.5f ) + //todo 2D模式下需要注意ADAS部分遮挡 + //.setPointToCenter(0.5f, 0.5f) + // 根据 FunctionBuildConfig 配置的皮肤样式设置题图的样式 + + if (ProcessUtils.getCurrentProcessName().contains(":passenger")) { + mapParams .setStyleMode(MapParams.MAP_STYLE_DAY_VR); + }else{ + mapParams .setStyleMode(MapParams.MAP_STYLE_DAY_VR); + } + MapAutoApi.INSTANCE.init(this, mapParams); + startUpInStage1(); super.onCreate(); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java index b7f5d84f1e..0a14768b07 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java @@ -55,34 +55,35 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView(Context context) { - MapParams mapParams = MapParams.Companion.init(); - mapParams.setDebugMode(false) - //todo 1-使用本地地图数据,0-使用在线地图数据 - //.setDataFileSource(1) - .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) - .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_3D) - .setHDVisibileArray(new int[]{HDTypes.DIVIDER.type, - HDTypes.ROAD_AREA.type, - HDTypes.STOP_LINE.type, - HDTypes.ARROW.type, - HDTypes.STATION_BRIDGE.type, - HDTypes.ZEBRA_LINE.type, - HDTypes.GREEN_BELT.type, - HDTypes.DIVERSION.type, - HDTypes.SAFE_ISLAND.type, - HDTypes.ALPHANUMERIC.type, - HDTypes.GUARDBAR.type, - HDTypes.TRAFFIC_DEVICE.type, - HDTypes.CABLE.type, - HDTypes.SIGNAL_LINE.type}) - // .setZoom( 20 ) - // .setPointToCenter( 0.734375f, 0.5f ) - //todo 2D模式下需要注意ADAS部分遮挡 - //.setPointToCenter(0.5f, 0.5f) - // 根据 FunctionBuildConfig 配置的皮肤样式设置题图的样式 - .setStyleMode(FunctionBuildConfig.skinMode == 0 ? MapParams.MAP_STYLE_NIGHT_VR : MapParams.MAP_STYLE_DAY_VR); - - MapAutoApi.INSTANCE.init(context, mapParams); +// MapParams mapParams = MapParams.Companion.init(); +// mapParams.setDebugMode(false) +// //todo 1-使用本地地图数据,0-使用在线地图数据 +// //.setDataFileSource(1) +// .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) +// .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_3D) +// .setHDVisibileArray(new int[]{HDTypes.DIVIDER.type, +// HDTypes.ROAD_AREA.type, +// HDTypes.STOP_LINE.type, +// HDTypes.ARROW.type, +// HDTypes.STATION_BRIDGE.type, +// HDTypes.ZEBRA_LINE.type, +// HDTypes.GREEN_BELT.type, +// HDTypes.DIVERSION.type, +// HDTypes.SAFE_ISLAND.type, +// HDTypes.ALPHANUMERIC.type, +// HDTypes.GUARDBAR.type, +// HDTypes.TRAFFIC_DEVICE.type, +// HDTypes.CABLE.type, +// HDTypes.SIGNAL_LINE.type}) +// // .setZoom( 20 ) +// // .setPointToCenter( 0.734375f, 0.5f ) +// //todo 2D模式下需要注意ADAS部分遮挡 +// //.setPointToCenter(0.5f, 0.5f) +// // 根据 FunctionBuildConfig 配置的皮肤样式设置题图的样式 +// .setStyleMode(FunctionBuildConfig.skinMode == 0 ? MapParams.MAP_STYLE_NIGHT_VR : MapParams.MAP_STYLE_DAY_VR); +// +// MapAutoApi.INSTANCE.init(context, mapParams); +// MapAutoView mapAutoView = new MapAutoView(context); //mapAutoView.registerRenderListener(l -> Log.i(TAG, "renderTime: " + l)); IMogoMapView mapView = new AMapViewWrapper(mapAutoView);