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

upgrade obu version

Browse Source
This commit is contained in:
lixiaopeng
2021-09-26 10:17:45 +08:00
committed by 董宏宇
parent fbfc6cdd0d
commit 58002d4258
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,7 @@ class MogoPrivateObuManager private constructor() {
info.threat_info.app_id,
info.status,
info.ext_info.lights,
info.ext_info.getLightIndex()
info.ext_info.index
)
}
}
@@ -477,17 +477,17 @@ class MogoPrivateObuManager private constructor() {
/**
* 处理红绿灯
*/
private fun handlerTrafficLight(appId: Int, status: Int, lights: List<Light>, indicator: Int) {
private fun handlerTrafficLight(appId: Int, status: Int, lights: List<Light>, index: Int) {
LogUtils.dTag(
MogoObuConst.TAG_MOGO_OBU,
"handlerTrafficLight appId = $appId --- status = $status ---indicator = $indicator ---lights.size = ${lights.size} ---lights = $lights "
"handlerTrafficLight appId = $appId --- status = $status ---index = $index ---lights.size = ${lights.size} ---lights = $lights "
)
when (status) {
// 添加
ObuConstants.STATUS.ADD,
ObuConstants.STATUS.UPDATE
-> {
changeTrafficLightStatus(appId, lights, indicator)
changeTrafficLightStatus(appId, lights, index)
}
// 删除
ObuConstants.STATUS.DELETE -> {
@@ -507,16 +507,16 @@ class MogoPrivateObuManager private constructor() {
private fun changeTrafficLightStatus(
appId: Int,
lights: List<Light>,
indicator: Int
index: Int
) {
var ttsContent = ""
var alertContent = ""
//这里需要根据真实数据确定 indicator 取值方式
if (indicator != -1 && lights.size >= indicator) {
val currentLight = lights[0]
//这里需要根据真实数据确定 index 取值方式
if (index != -1 && lights.size >= index) {
val currentLight = lights[index]
LogUtils.dTag(
MogoObuConst.TAG_MOGO_OBU,
"currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} --- indicator = $indicator ---appId = $appId"
"currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} --- index = $index ---appId = $appId"
)
when (currentLight.phase) {
// 灯光不可用