From c920f9bdc46ce3619b4b68878b2308aef6e64ee8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 30 Aug 2022 18:08:12 +0800 Subject: [PATCH] add roadarrow type --- .../com/mogo/eagle/core/data/trafficlight/RoadArrow.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt index 765824cbd7..a1f91ed67d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt @@ -12,18 +12,20 @@ class RoadArrow { private const val TURN_LEFT_OR_U_TURN = 206 //左转或转向 private const val TURN_RIGHT = 208 //右转 private const val TURN_LEFT_OR_RIGHT = 210 //左右转向 - const val U_TURN = 211 //转向 + private const val U_TURN = 211 //转向 + private const val STRAIGHT_OR_LEFT_OR_RIGHT = 215 //直行或左转或右转 + private const val TURN_RIGHT_OR_U_TURN = 217 //右转或转向 fun isLeft(arrowId: Int): Boolean { return arrowId == STRAIGHT_OR_LEFT || arrowId == TURN_LEFT || arrowId == TURN_LEFT_OR_U_TURN || arrowId == TURN_LEFT_OR_RIGHT } fun isStraight(arrowId: Int): Boolean { - return arrowId == STRAIGHT_AHEAD || arrowId == STRAIGHT_OR_RIGHT || arrowId == STRAIGHT_OR_U_TURN + return arrowId == STRAIGHT_AHEAD || arrowId == STRAIGHT_OR_RIGHT || arrowId == STRAIGHT_OR_U_TURN || arrowId == STRAIGHT_OR_LEFT_OR_RIGHT } fun isRight(arrowId: Int): Boolean { - return arrowId == TURN_RIGHT || arrowId == STRAIGHT_OR_RIGHT || arrowId == TURN_LEFT_OR_RIGHT + return arrowId == STRAIGHT_OR_RIGHT || arrowId == TURN_RIGHT || arrowId == TURN_RIGHT_OR_U_TURN || arrowId == TURN_LEFT_OR_RIGHT } fun isOnlyRight(arrowId: Int): Boolean {