From ccb002b5389e2c33d59eefa5cb03f556a173b9a6 Mon Sep 17 00:00:00 2001 From: renwj Date: Sun, 15 Jan 2023 10:55:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[2.13.2]=E4=BC=98=E5=8C=96MarkerManager?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/v2x/events/marker/MarkerManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/MarkerManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/MarkerManager.kt index d40eb891d9..6ab69fffd1 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/MarkerManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/MarkerManager.kt @@ -137,9 +137,9 @@ object MarkerManager { } if (!removeLineError && !removeMarkerError) { toRemove.remove() - } - synchronized(elapsedDistances) { - elapsedDistances.remove(marker) + synchronized(elapsedDistances) { + elapsedDistances.remove(marker) + } } } else { elapsedDistances[marker] = elapsed From b9a59607b94222c11d0d0156e5d23372b326696f Mon Sep 17 00:00:00 2001 From: renwj Date: Sun, 15 Jan 2023 10:56:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[2.13.2]=E4=BC=98=E5=8C=96=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=A7=86=E8=A7=92=E7=9B=B8=E5=85=B3=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37b723e351..5ac2a51688 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 @@ -896,7 +896,7 @@ public class AMapViewWrapper implements IMogoMapView, case 7: return MAP_STYLE_VR_ROMA; default: - throw new IllegalStateException("mode is unCorrect"); + return MODE_MEDIUM_SIGHT; } } From a7ec45d5d2fedac59591d17483f6a540ce5e6079 Mon Sep 17 00:00:00 2001 From: renwj Date: Sun, 15 Jan 2023 14:40:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[2.13.2]=E4=BF=AE=E6=AD=A3=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8F=8A=E7=BB=98=E5=88=B6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java index 4d76ad0100..4e1ae694ce 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java @@ -73,7 +73,7 @@ public class V2XRoadEventEntity implements Serializable { } public String getTts() { - return tts; + return EventTypeEnumNew.getTts(getPoiType()); } public void setTts(String tts) {