diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt index 3c9fe2419f..a840814b4a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt @@ -48,7 +48,7 @@ class BrakeViewStatus @JvmOverloads constructor( if (brakeLight == 1) { //刹车灯亮 if (!isBrake) { isBrake = true - CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500) GlobalScope.launch(Dispatchers.Main) { var appearAnimation = AlphaAnimation(0f, 1f) appearAnimation.duration = 300 @@ -63,7 +63,7 @@ class BrakeViewStatus @JvmOverloads constructor( } else { //不踩刹车,就消失 if (isBrake) { isBrake = false - CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) GlobalScope.launch(Dispatchers.Main) { // scaleImageAndTv() var disappearAnimation = AlphaAnimation(1f, 0f) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt index 8f0933ac44..7195f230e5 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt @@ -112,8 +112,8 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, private fun turn(lightNum: Int) { if (currentLevel != lightNum) { when (lightNum) { - 0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) - 1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500) + 0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) + 1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(1, 500) 2 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500) } currentLevel = lightNum diff --git a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d index 0b1ace476a..55c7942ec7 100644 Binary files a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d and b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d index 47a6be55af..3802f3e5ec 100644 Binary files a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d and b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/huanwei.nt3d b/core/mogo-core-res/src/main/res/raw/huanwei.nt3d index 9a177e5fdb..85be9ec991 100644 Binary files a/core/mogo-core-res/src/main/res/raw/huanwei.nt3d and b/core/mogo-core-res/src/main/res/raw/huanwei.nt3d differ 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 909f474514..f905999156 100644 Binary files a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d and b/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d differ diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index a691df9e5a..50190778f2 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -194,7 +194,8 @@ public interface IMogoMapUIController { void setCarCursorOption(@Nullable CarCursorOption option); /** - * @param type :车尾灯类型 time: 闪烁时间 最小500ms 小于500ms 默认为500ms + * @param type :车尾灯类型 0=默认 1=左黄 2=右黄 3=双黄 4=双红 + * @param time: 闪烁时间 最小500ms 小于500ms 默认为500ms */ void setCarLightsType(int type, int time); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index c9cd8b2ffb..ed9fa04b01 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -150,6 +150,9 @@ public class AMapWrapper implements IMogoMap { markerOptionsArrayList.add(markerOptions); } }); + if(markerOptionsArrayList.size() == 0){ + return; + } long time = markerOptionsArrayList.get(0).getTime(); // 最后一个参数,是否管理锚点的删除 MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);