Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -73,7 +73,7 @@ public class V2XRoadEventEntity implements Serializable {
|
||||
}
|
||||
|
||||
public String getTts() {
|
||||
return tts;
|
||||
return EventTypeEnumNew.getTts(getPoiType());
|
||||
}
|
||||
|
||||
public void setTts(String tts) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user