diff --git a/config.gradle b/config.gradle index 63611f1773..b0047e63e0 100644 --- a/config.gradle +++ b/config.gradle @@ -164,8 +164,8 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", // mebulaobu : 'com.zhidao.support.nebulaobu:nebulaobu:1.0.0.3', - mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.12', - mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.2', + mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.13', + mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.3', // 左侧面板 moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index f168eb99e7..7b126c75d5 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -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, indicator: Int) { + private fun handlerTrafficLight(appId: Int, status: Int, lights: List, 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, - 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) { // 灯光不可用