From c969177a6c12e2c951186d10429dcfbac248d739 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 12 Dec 2022 12:54:08 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=20[Change]=20[1=E3=80=81=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E9=AB=98=E7=B2=BE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E9=85=8D=E7=BD=AE=E7=9A=84=E4=BD=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D=E8=AE=BE=E7=BD=AE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=9A=AE=E8=82=A4=E7=9A=84=E4=BD=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B9=98=E5=AE=A2=E5=9C=B0=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=A2=AB=E6=94=B9=E5=8F=98=E4=B8=BA=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=202=E3=80=81=E5=90=8C=E4=BA=8B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E5=B1=8F=E4=B8=8B=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=80=80=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../com/mogo/launcher/MogoApplication.java | 33 --------------- .../mogo/launcher/stageone/ConfigStartUp.kt | 40 +++++++++++++++++-- .../java/com/mogo/map/AMapViewWrapper.java | 30 +++++++------- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 39df71a250..422a345196 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -33,39 +33,6 @@ 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/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index d4f08765d7..c82f06e42b 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -10,13 +10,15 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ProcessUtils import com.mogo.launcher.BuildConfig import com.mogo.launcher.R import com.mogo.test.crashreport.CrashReportConstants import com.rousetime.android_startup.AndroidStartup -import com.zhjt.mogo_core_function_devatools.env.* +import com.zhidaoauto.map.sdk.open.HDTypes +import com.zhidaoauto.map.sdk.open.MapAutoApi +import com.zhidaoauto.map.sdk.open.MapParams +import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager class ConfigStartUp : AndroidStartup() { @@ -83,7 +85,7 @@ class ConfigStartUp : AndroidStartup() { // 配置BuglyAppID：MoGoEagleEye CrashReportConstants.buglyAppID = "ac71228f85" - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)|| + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //控制HMI展示元素 将不用手动调用setXXXXXViewVisibility HmiBuildConfig.isShowSpeedView = false @@ -122,5 +124,37 @@ class ConfigStartUp : AndroidStartup() { } } + val mapParams = MapParams.init() + mapParams.setDebugMode(false) //todo 1-使用本地地图数据，0-使用在线地图数据 + //.setDataFileSource(1) + .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) + .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR) + .setHDVisibileArray(intArrayOf(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 (FunctionBuildConfig.skinMode == 1) { + mapParams.setStyleMode(MapParams.MAP_STYLE_DAY_VR) + } else { + mapParams.setStyleMode(MapParams.MAP_STYLE_NIGHT_VR) + } + MapAutoApi.init(context, mapParams) + } } \ No newline at end of file diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index e94abde8ee..5b0452ba1f 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1033,21 +1033,21 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void stepInVrMode(boolean isDayMode) { - try { - int mapStyle; - if (isDayMode) { - mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; - mapStyle = MapAutoApi.MAP_STYLE_DAY_VR; - } else { - mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; - mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR; - } - if (mMapView != null && mMapView.getMapAutoViewHelper() != null) { - mMapView.getMapAutoViewHelper().setMapStyle(mapStyle); - } - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// int mapStyle; +// if (isDayMode) { +// mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; +// mapStyle = MapAutoApi.MAP_STYLE_DAY_VR; +// } else { +// mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; +// mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR; +// } +// if (mMapView != null && mMapView.getMapAutoViewHelper() != null) { +// mMapView.getMapAutoViewHelper().setMapStyle(mapStyle); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } } @Override