From 0554fe45ed97ae8aae4176ac3fe402587ca1567a Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 16 Feb 2022 19:43:27 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E6=9B=B4=E6=94=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=87=AA=E8=BD=A6=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../data/autopilot/AutopilotStatusInfo.kt | 4 ++-- .../src/main/res/raw/xiaobache.nt3d | Bin 1014392 -> 1014392 bytes .../mogo/map/impl/custom/AMapViewWrapper.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt index bf88002dfc..1d453944e7 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt @@ -60,12 +60,12 @@ class AutopilotStatusInfo : Serializable { var rtk = 0 /** - * 自动驾驶状态 0非自动驾驶,1自动驾驶 + * 底盘的自动驾驶状态 0非自动驾驶,1自动驾驶 */ var pilotmode = 0 /** - * 自动驾驶状态 0非自动驾驶,1自动驾驶 + * 底盘的自动驾驶状态 0非自动驾驶,1自动驾驶 */ var control_pilotmode = 0 diff --git a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d b/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d index 158ebecbcc483836f2c2083dd51487ce27172518..baec2168db5d0519280eb86beaf70686c5056806 100644 GIT binary patch delta 55010 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 H*v0%G7d~^@ diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index ba15a9157a..1f747a7c0d 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -134,8 +134,9 @@ public class AMapViewWrapper implements IMogoMapView, if (options.getMyLocationStyle() != null) { options.getMyLocationStyle().setDisplayAnimEnable(false); } - // 设置自车的图片对象 - //options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(DEFAULT_OPTION.getCarCursorRes())); + //修改自车模型,未来需区分车的类型 + options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true)); +// MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); } } @@ -716,7 +717,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onMapLoaded() { Logger.i(TAG, "autoop--onMapLoaded: "); - MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型,未来需区分车的类型 mMapLoaded = true; CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); Trace.beginSection("timer.onCameraChangeFinish");