diff --git a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt index facc8c0bcd..d8f62f3763 100644 --- a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt +++ b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt @@ -7,8 +7,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import androidx.test.platform.app.InstrumentationRegistry import com.google.protobuf.ByteString +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.multidisplay.TelematicConstant +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager @@ -125,6 +128,9 @@ class V2NTest { val polygon = generateTriangle(point.first, point.second, car.heading, r * 1e-5) val data = TrackedObject.getDefaultInstance().toBuilder().setType(13).setLongitude(point.first).setLatitude(point.second).setAltitude(0.0).setSystemTime(System.currentTimeMillis() * 1.0 / 1000).setSatelliteTime(1.0).setUuid(10).setCarID("1").setColor("#ffffff").setHeading(car.heading).setSpeed(0.0).setDrawLevel(1).setDriverTime(1.0).setCameraIp("172.18.7.40").setVideoUrl("").addAllImageUrl(Collections.singletonList("http://www.baidu.com")).addAllPolygon(polygon.map { Location.getDefaultInstance().toBuilder().setLongitude(it.first).setLatitude(it.second).setAltitude(0.0).setHeading(0.0).setStation(false).build() }).setDetectStartTime(System.currentTimeMillis()).setV2XUuid("xxxxx1").setStrUuid("xxxxx2").build() val trafficData = Collections.singletonList(data) + CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(AutopilotControlParameters().also { + it.autoPilotLine = AutoPilotLine(10L, "", "","", "", System.currentTimeMillis(), "") + }) CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_SHI_GU, data.toByteArray()) CallerAutopilotIdentifyListenerManager.invokeAutopilotIdentifyDataUpdate(trafficData) delay(TimeUnit.MINUTES.toMillis(10)) @@ -185,6 +191,9 @@ class V2NTest { delay(2000) val data = V2nCrossSpeed.getDefaultInstance().toBuilder().setSpeedLeftMin(0).setSpeedLeftMax(0).setSpeedRightMin(0).setSpeedRightMax(0).setSpeedStraightMin(30).setSpeedStraightMax(54).setMaxSpeed(0).setMaxStatus(0).setLng(newPoint.first).setLat(newPoint.second).build() CallerV2nNioEventListenerManager.invokeV2nNioGreenWavePassageEvent(data) + CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(AutopilotControlParameters().also { + it.autoPilotLine = AutoPilotLine(10L, "", "","", "", System.currentTimeMillis(), "") + }) while (!CallerTelematicManager.getServerStarted()) { Log.d(TAG , "乘客屏未连接, 2秒后重试...") delay(2000) @@ -202,21 +211,6 @@ class V2NTest { if (millis > 0) { delay(millis) } - val targetX = arguments.getString("lon", "0").toDouble() - val targetY = arguments.getString("lat", "0").toDouble() - val targetHeading = arguments.getString("angle", "0").toDouble() - val targetDistance = arguments.getString("distance", "0").toDouble() - var car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() - var distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) - Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") - while (distance > targetDistance) { - delay(2000) - car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() - distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) - } - Log.d(TAG, "2 -- > target_distance: $targetDistance, current distance: $distance") - var newPoint = DrivingDirectionUtils.calculateNewPoint(targetX, targetY, targetHeading, targetDistance) - Log.d(TAG, "location:[x:${targetX}, y:${targetY}, new_location:[x:${newPoint.first}, y:${newPoint.second}]") FunctionBuildConfig.isNewV2NData = true FunctionBuildConfig.v2nMainSwitch = true runCatching { @@ -228,13 +222,34 @@ class V2NTest { } delay(2000) + val targetX = arguments.getString("lon", "0").toDouble() + val targetY = arguments.getString("lat", "0").toDouble() + val targetHeading = arguments.getString("angle", "0").toDouble() + val targetDistance = arguments.getString("distance", "0").toDouble() + val eventDistance = arguments.getString("event_distance", "60").toDouble() + var car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + var distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) + Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") + while (distance > targetDistance) { + delay(2000) + Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") + car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) + } + Log.d(TAG, "2 -- > target_distance: $targetDistance, current distance: $distance") + car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + var newPoint = DrivingDirectionUtils.calculateNewPoint(car.longitude, car.latitude, car.heading , eventDistance) + Log.d(TAG, "location:[x:${targetX}, y:${targetY}, new_location:[x:${newPoint.first}, y:${newPoint.second}]") val eventId = "xxxxxxxxxxxxx" + CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(AutopilotControlParameters().also { + it.autoPilotLine = AutoPilotLine(10L, "", "","", "", System.currentTimeMillis(), "") + }) for (i in 0 until 500) { - val data = MessagePad.Event.getDefaultInstance().toBuilder().setLongitude(newPoint.first).setLatitude(newPoint.second).setEventId(eventId).setTimestamp(System.currentTimeMillis()).addAllTargetIds(emptyList()).addTargetIdsBytes(ByteString.EMPTY).addTargetIds("0").setExts("{ \"cameraIp\": \"172.18.7.40\",\"eventExtUnits\":[{\"heading\":266.5414733886719,\"uuid\":\"e440951e-5eb6-4091-8560-72a5d8aaf229\"}] }").build() + val data = MessagePad.Event.getDefaultInstance().toBuilder().setLongitude(newPoint.first).setLatitude(newPoint.second).setGnssType(2).setEventId(eventId).setTimestamp(System.currentTimeMillis()).addAllTargetIds(emptyList()).addTargetIdsBytes(ByteString.EMPTY).addTargetIds("0").setExts("{ \"cameraIp\": \"172.18.7.40\",\"eventExtUnits\":[{\"heading\":266.5414733886719,\"uuid\":\"e440951e-5eb6-4091-8560-72a5d8aaf229\"}] }").build() CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_PEOPLE_CROSS, data.toByteArray()) CallerV2nNioEventListenerManager.invokeV2nNioCrossoverEvent(data) delay(50) - newPoint = DrivingDirectionUtils.calculateNewPoint(targetX, targetY, targetHeading, 1.0) + newPoint = DrivingDirectionUtils.calculateNewPoint(newPoint.first, newPoint.second, targetHeading, 0.1) } delay(TimeUnit.MINUTES.toMillis(10)) } @@ -246,21 +261,6 @@ class V2NTest { if (millis > 0) { delay(millis) } - val targetX = arguments.getString("lon", "0").toDouble() - val targetY = arguments.getString("lat", "0").toDouble() - val targetHeading = arguments.getString("angle", "0").toDouble() - val targetDistance = arguments.getString("distance", "0").toDouble() - var car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() - var distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) - Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") - while (distance > targetDistance) { - delay(2000) - car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() - distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) - } - Log.d(TAG, "2 -- > target_distance: $targetDistance, current distance: $distance") - var newPoint = DrivingDirectionUtils.calculateNewPoint(targetX, targetY, targetHeading, targetDistance) - Log.d(TAG, "location:[x:${targetX}, y:${targetY}, new_location:[x:${newPoint.first}, y:${newPoint.second}]") FunctionBuildConfig.isNewV2NData = true FunctionBuildConfig.v2nMainSwitch = true runCatching { @@ -271,13 +271,34 @@ class V2NTest { CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } delay(2000) + val targetX = arguments.getString("lon", "0").toDouble() + val targetY = arguments.getString("lat", "0").toDouble() + val targetHeading = arguments.getString("angle", "0").toDouble() + val targetDistance = arguments.getString("distance", "0").toDouble() + val eventDistance = arguments.getString("event_distance", "60").toDouble() + var car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + var distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) + Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") + while (distance > targetDistance) { + delay(2000) + Log.d(TAG, "target_distance: $targetDistance, current distance: $distance") + car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, targetX, targetY) + } + car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + Log.d(TAG, "2 -- > target_distance: $targetDistance, current distance: $distance") + var newPoint = DrivingDirectionUtils.calculateNewPoint(car.longitude, car.latitude, car.heading , eventDistance) + Log.d(TAG, "location:[x:${targetX}, y:${targetY}, new_location:[x:${newPoint.first}, y:${newPoint.second}]") val eventId = "yyyyyyyyyyyyy" + CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(AutopilotControlParameters().also { + it.autoPilotLine = AutoPilotLine(10L, "", "","", "", System.currentTimeMillis(), "") + }) for (i in 0 until 500) { val data = MessagePad.Event.getDefaultInstance().toBuilder().setLongitude(newPoint.first).setLatitude(newPoint.second).setEventId(eventId).setTimestamp(System.currentTimeMillis()).addAllTargetIds(emptyList()).addTargetIdsBytes(ByteString.EMPTY).setGnssType(2).addTargetIds("0").setExts("{ \"cameraIp\": \"172.18.7.40\",\"eventExtUnits\":[{\"heading\":266.5414733886719,\"uuid\":\"e440951e-5eb6-4091-8560-72a5d8aaf229\"}] }").build() CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_OTHER_RETROGRADE_VEHICLE, data.toByteArray()) CallerV2nNioEventListenerManager.invokeV2nNioOtherRetrogradeEvent(data) delay(50) - newPoint = DrivingDirectionUtils.calculateNewPoint(targetX, targetY, targetHeading, 1.0) + newPoint = DrivingDirectionUtils.calculateNewPoint(newPoint.first, newPoint.second, targetHeading, 1.0) } delay(TimeUnit.MINUTES.toMillis(10)) } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 02e76ef4f4..2f3d1b4eaa 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -322,7 +322,8 @@ internal object V2NIdentifyDrawer: IEventDismissListener { Logger.d(TAG, "cameraIp: $cameraIp, heading:$heading, uuid: $uuid") val newEventId = "other_retrograde_vehicle_${event.eventId}" val isUseGps = event.gnssType != 0 - val eventLocation = if (isUseGps) arrayOf(event.longitude, event.latitude) else CoordinateTransform.GCJ02ToWGS84(event.longitude, event.latitude) + Logger.i(TAG, "isUseGps --> $isUseGps") + val eventLocation = arrayOf(event.longitude, event.latitude) val carLocation = if (isUseGps) CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() else CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() AiRoadMarker.aiMakers.getOrPut(newEventId) { val distance = CoordinateUtils.calculateLineDistance(carLocation.longitude, carLocation.latitude, eventLocation[0], eventLocation[1]) @@ -396,7 +397,8 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } Logger.d(TAG, "cameraIp: $cameraIp, heading:$heading, uuid: $uuid") val isUseGps = data.gnssType != 0 - val eventLocation = if (isUseGps) arrayOf(data.longitude, data.latitude) else CoordinateTransform.GCJ02ToWGS84(data.longitude, data.latitude) + Logger.i(TAG, "isUseGps --> $isUseGps") + val eventLocation = arrayOf(data.longitude, data.latitude) val carLocation = if (isUseGps) CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() else CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() val distance = CoordinateUtils.calculateLineDistance(carLocation.longitude, carLocation.latitude, eventLocation[0], eventLocation[1]) AiRoadMarker.aiMakers.getOrPut(data.eventId) { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index 27481e1904..d27373bc91 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -109,12 +109,14 @@ class AiRoadMarker { .set3DMode(true) .isUseGps(marker.isUseGps) .icon3DRes(EventTypeEnumNew.getMarker3DRes(marker.poiType)) - .anchorColor("#D65D5AFF") .controlAngle(true) .anchor(0.5f, 0.5f) .rotate(marker.poi_angle.toFloat()) .longitude(marker.poi_lon) .latitude(marker.poi_lat) + if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType) { + builder.anchorColor("#D6E1BA9A") + } CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p -> if (!markerIds.contains(markerId)) { markerIds.add(markerId) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt index 5ed0a11e9f..a7734a2868 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt @@ -78,7 +78,7 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider { override fun onStopLineInfo(info: StopLine) { Log.d(TAG, "-- onStopLineInfo --: ${info.distance}") - if (!hasCrossRoad && info.distance <= 30.0) { + if (!hasCrossRoad && info.distance <= 80.0) { hasCrossRoad = true triggerRoadId.set(this.roadId.get()) distanceOfCarToStopLine.set(info.distance) @@ -140,7 +140,11 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider { if (delay > 0) { delay(delay) } - val lastPriority = prevScene.get()?.priority ?: Int.MIN_VALUE + val prev = prevScene.get() + if (prev?.javaClass == scene.javaClass) { + return@launch + } + val lastPriority = prev?.priority ?: Int.MIN_VALUE val currentPriority = scene.priority if (lastPriority > currentPriority) { return@launch @@ -161,6 +165,11 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider { Log.d(TAG, "--- doChangeAngle ---： $target") val prev = prevScene.get() try { + if (!target.isCanTouch) { + CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(false) + } else { + CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true) + } it.changeMapVisualAngle(angle, null) } finally { if (prev == null || prev.javaClass != target.javaClass) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt index fff66464ca..0ae4cc5a54 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt @@ -22,6 +22,9 @@ class CrossRoad(private val delayTime: Long): Scene { override val isCanSwitch: Boolean get() = false + override val isCanTouch: Boolean + get() = false + override fun toString(): String { return "CrossRoad(delayTime=${delayTime}, priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority})" } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt index 37c2667b48..503cf1091f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt @@ -27,6 +27,9 @@ class Default(val delayTime: Long = 2, val unit: TimeUnit = TimeUnit.SECONDS): S override val isCanSwitch: Boolean get() = true + override val isCanTouch: Boolean + get() = true + override fun toString(): String { return "Default(delay=$delay, unit=$unit, angle=$angle, priority=$priority)" } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt index 1a4429092b..2f2b612c17 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt @@ -19,4 +19,7 @@ class LongSight(private val delayTime: Long, private val unit: TimeUnit = TimeUn override val isCanSwitch: Boolean get() = true + + override val isCanTouch: Boolean + get() = true } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt index 23ec37979b..5244428bac 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt @@ -27,4 +27,7 @@ class RoadEvent(private val delayTime: Long, private val unit: TimeUnit): Scene override val isCanSwitch: Boolean get() = true + + override val isCanTouch: Boolean + get() = true } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index ce55fc2610..cc17a35523 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -486,7 +486,7 @@ enum class EventTypeEnumNew( "交通拥堵", poiTypeSrcVr = R.drawable.v2x_icon_yongdu_vr, content = "前方%s米交通拥堵", - tts = "前方%s米交通拥堵" + tts = "前方%s米交通拥堵, 蘑菇提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_JINGZHI( @@ -494,7 +494,7 @@ enum class EventTypeEnumNew( "静止障碍物占道", poiTypeSrcVr = R.drawable.v2x_icon_jingzhi_zhangai, content = "前方%s米静止障碍物占道", - tts = "前方%s米静止障碍物占道" + tts = "前方%s米静止障碍物占道, 蘑菇提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_SHIGU( @@ -502,7 +502,7 @@ enum class EventTypeEnumNew( "道路事故", poiTypeSrcVr = R.drawable.v2x_icon_shigu_sanjiaopai, content = "前方%s米道路事故", - tts = "前方%s米道路事故" + tts = "前方%s米道路事故,蘑菇提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_SHIGONG( @@ -510,7 +510,7 @@ enum class EventTypeEnumNew( "道路施工", poiTypeSrcVr = R.drawable.v2x_icon_shigong_zhandao, content = "前方%s米道路施工", - tts = "前方%s米道路施工" + tts = "前方%s米道路施工,蘑菇提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE( "100062", @@ -530,7 +530,7 @@ enum class EventTypeEnumNew( "100064", "行人横穿", poiTypeSrcVr = View.NO_ID, - content = "前方%s米有行人/非机动车横穿，蘑菇提醒您提前减速,注意观察,小心通过", + content = "前方%s米有行人/非机动车横穿", tts = "前方%s米有行人/非机动车横穿，蘑菇提醒您提前减速,注意观察,小心通过" ), TYPE_ERROR( diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt index 81716acbcb..3a1552a35d 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt @@ -8,11 +8,9 @@ interface IAttach { val displayThreshold: Long //最大展示时长 > 0; 表示最长展示多长时间， -1 表示，一直展示，直到触发默认视角, 0: 默认视角专用值， val delay: Long // 延迟多长时间切换 val isCanSwitch: Boolean // 是否可切换 - } + val isCanTouch: Boolean // 是否响应地图触摸事件 +} interface Scene: IAttach - - -