yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

Browse Source
This commit is contained in:
donghongyu
2022-11-29 19:30:31 +08:00
parent 084a13f584 96585e089e
commit 96089e7268
5 changed files with 561 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1003
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
View File

File diff suppressed because it is too large Load Diff

4
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
View File

@@ -8,7 +8,6 @@ import androidx.core.util.Pair
import androidx.localbroadcastmanager.content.*
import com.mogo.cloud.commons.utils.*
import com.mogo.cloud.passport.*
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION
import com.mogo.commons.module.status.IMogoStatusChangedListener
import com.mogo.commons.module.status.MogoStatusManager
@@ -59,7 +58,6 @@ import com.mogo.eagle.core.utilcode.mogo.storage.*
import com.mogo.eagle.core.utilcode.util.*
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.eagle.core.utilcode.util.Utils
import com.mogo.map.MogoMarkerManager
import com.mogo.map.listener.*
import com.mogo.map.marker.*
import com.mogo.v2x.*
@@ -578,7 +576,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb
// 不显示弹框，其它保留
CallerMsgBoxManager.saveMsgBox(
MsgBoxBean(
MsgBoxType.OBU,
MsgBoxType.V2X,
V2XMsg(tempAppId.toString(),
tempContent,
tempTts)

115
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt
View File

@@ -55,6 +55,14 @@ enum class V2iEventTypeEnum(
content = "前方%s米逆行车辆，影响路段%s米",
tts = "前方%s米逆行车辆，影响路段%s米"
),
TYPE_USECASE_ID_ROAD_SPEED_LIMIT(
1.toString(),
"限速",
poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
content = "前方%s米限速",
tts = "前方%s米限速"
),
//------------道路危险情况预警 end ----------->
//------------车内标牌 start -------------->
@@ -68,169 +76,155 @@ enum class V2iEventTypeEnum(
TYPE_ID_SHAPR_TURNS(
2.toString(),
"急转弯",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米急转弯，影响路段%s米",
tts = "前方%s米急转弯，影响路段%s米"
poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp,
content = "前方%s米急转弯",
tts = "前方%s米急转弯"
),
TYPE_ID_BRIDGE(
8.toString(),
"桥梁",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米桥梁，影响路段%s米",
tts = "前方%s米桥梁，影响路段%s米"
content = "前方%s米桥梁",
tts = "前方%s米桥梁"
),
TYPE_ID_PEDESTRIAN(
10.toString(),
"行人",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米行人，影响路段%s米",
tts = "前方%s米行人，影响路段%s米"
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
content = "前方%s米行人",
tts = "前方%s米行人"
),
TYPE_ID_SLIPPERY_ROAD(
17.toString(),
"路滑",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米路滑，影响路段%s米",
tts = "前方%s米路滑，影响路段%s米"
content = "前方%s米路滑",
tts = "前方%s米路滑"
),
TYPE_ID_TUNNEL(
21.toString(),
"隧道",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米隧道，影响路段%s米",
tts = "前方%s米隧道，影响路段%s米"
content = "前方%s米隧道",
tts = "前方%s米隧道"
),
TYPE_ID_FERRY(
22.toString(),
"渡轮",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米渡轮，影响路段%s米",
tts = "前方%s米渡轮，影响路段%s米"
content = "前方%s米渡轮",
tts = "前方%s米渡轮"
),
TYPE_ID_UNEVEN_ROAD(
24.toString(),
"路面不平",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米路面不平，影响路段%s米",
tts = "前方%s米路面不平，影响路段%s米"
content = "前方%s米路面不平",
tts = "前方%s米路面不平"
),
TYPE_ID_NON_MOTOR_VEHICLE(
32.toString(),
"非机动车",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米有非机动车，影响路段%s米",
tts = "前方%s米有非机动车，影响路段%s米"
content = "前方%s米有非机动车",
tts = "前方%s米有非机动车"
),
TYPE_ID_OBSTACLE(
36.toString(),
"障碍",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米障碍，影响路段%s米",
tts = "前方%s米障碍，影响路段%s米"
content = "前方%s米障碍",
tts = "前方%s米障碍"
),
TYPE_FOURS_ROAD_WORK(
38.toString(),
"施工",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "前方%s米施工，影响路段%s米",
tts = "前方%s米施工，影响路段%s米"
content = "前方%s米施工",
tts = "前方%s米施工"
),
TYPE_VEHICLE_QUEUE(
47.toString(),
"车队",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "前方%s米车队，影响路段%s米",
tts = "前方%s米车队，影响路段%s米"
content = "前方%s米车队",
tts = "前方%s米车队"
),
TYPE_NO_PASSING(
51.toString(),
"不通",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "前方%s米不通，影响路段%s米",
tts = "前方%s米不通，影响路段%s米"
content = "前方%s米不通",
tts = "前方%s米不通"
),
TYPE_NO_TURNING_AROUND(
75.toString(),
"禁止掉头",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "前方%s米禁止掉头，影响路段%s米",
tts = "前方%s米禁止掉头，影响路段%s米"
content = "前方%s米禁止掉头",
tts = "前方%s米禁止掉头"
),
TYPE_USECASE_ID_ROAD_NO_PARKING(
78.toString(),
"禁止停车",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米禁止停车，影响路段%s米",
tts = "前方%s米禁止停车，影响路段%s米"
content = "前方%s米禁止停车",
tts = "前方%s米禁止停车"
),
TYPE_USECASE_ID_ROAD_NO_TOOTING(
80.toString(),
"禁止鸣笛",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米禁止鸣笛，影响路段%s米",
tts = "前方%s米禁止鸣笛，影响路段%s米"
),
TYPE_USECASE_ID_ROAD_SPEED_LIMIT(
85.toString(),
"限速",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米限速，影响路段%s米",
tts = "前方%s米限速，影响路段%s米"
content = "前方%s米禁止鸣笛",
tts = "前方%s米禁止鸣笛"
),
// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT(
// 100.toString(),
// "直行或右转",
// poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
// content = "前方%s米直行或右转，影响路段%s米",
// tts = "前方%s米直行或右转，影响路段%s米"
// content = "前方%s米直行或右转",
// tts = "前方%s米直行或右转"
// ),
TYPE_USECASE_ID_BUS_WARNING(
123.toString(),
"公交提醒",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米公交提醒，影响路段%s米",
tts = "前方%s米公交提醒，影响路段%s米"
content = "前方%s米公交提醒",
tts = "前方%s米公交提醒"
),
TYPE_USECASE_ID_NARROW_RIGHT(
163.toString(),
"右侧变窄/车道数减少",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米右侧变窄/车道数减少，影响路段%s米",
tts = "前方%s米右侧变窄/车道数减少，影响路段%s米"
content = "前方%s米右侧变窄/车道数减少",
tts = "前方%s米右侧变窄/车道数减少"
),
TYPE_USECASE_ID_GAS_STATION(
201.toString(),
"加油站",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米加油站，影响路段%s米",
tts = "前方%s米加油站，影响路段%s米"
content = "前方%s米加油站",
tts = "前方%s米加油站"
),
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
242.toString(),
"学校",
poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
content = "前方%s米学校，影响路段%s米",
tts = "前方%s米学校，影响路段%s米"
content = "前方%s米学校",
tts = "前方%s米学校"
),
TYPE_USECASE_ID_ACCIDENT(
244.toString(),
"事故",
poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
content = "前方%s米事故，影响路段%s米",
tts = "前方%s米事故，影响路段%s米"
content = "前方%s米事故",
tts = "前方%s米事故"
),
//------------车内标牌 end -------------->
TYPE_USECASE_ID_IVS(
0x2B07.toString(),
"车内标牌",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "车内标牌",
tts = ""
),
TYPE_USECASE_ID_IVP(
0x2.toString(),
"闯红灯预警",
@@ -281,7 +275,6 @@ enum class V2iEventTypeEnum(
fun getWarningIcon(poiType: String?): Int {
return when (poiType) {
TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr
TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.poiTypeSrcVr
TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr
TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.poiTypeSrcVr
TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr
@@ -326,7 +319,6 @@ enum class V2iEventTypeEnum(
fun getWarningContent(poiType: String?): String {
return when (poiType) {
TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content
TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.content
TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content
TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.content
TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content
@@ -373,7 +365,6 @@ enum class V2iEventTypeEnum(
fun getWarningTts(poiType: String?): String {
return when (poiType) {
TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts
TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.tts
TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts
TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.tts
TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts