diff --git a/config.gradle b/config.gradle index c2c71ebf9c..2bd9bebad6 100644 --- a/config.gradle +++ b/config.gradle @@ -93,7 +93,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", - mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta5', + mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta6', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt index 6027695b0e..64722c7880 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt @@ -82,4 +82,8 @@ class MoGoObuProvider : IMoGoObuProvider { override fun deleteObuFile() { MogoPrivateObuNewManager.INSTANCE.deleteObuFile() } + + override fun setHvInfoSendCycle(time: Int) { + MogoPrivateObuNewManager.INSTANCE.setHvInfoSendCycle(time) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index ec4ff4a718..10ce62b628 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context +import android.util.Log import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.* @@ -74,6 +75,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { .registerTopic(MogoObuTopicId.RSI_WARNING) .registerTopic(MogoObuTopicId.RSM_WARNING) .registerTopic(MogoObuTopicId.MAP_MATCH) + .registerTopic(MogoObuTopicId.OBU_SYSTEM_STATUS) .build() //每次连接的时候如果连接连接了,先断开,防止ip改变等导致的连接失败 @@ -103,6 +105,11 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { } } + fun setHvInfoSendCycle(time: Int) { + Log.d("liyz", "---setHvInfoSendCycle = time = $time") +// ObuManager.getInstance().setHvInfoPushCycle(time); + } + /** * 当前的obu版本 */ @@ -199,6 +206,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * @param data 系统状态 */ override fun onObuSystemStatus(data: MogoObuSystemStatusData?) { + Log.d("liyz", "data.toString() = ${data.toString()}" ) CallerObuInfoListenerManager.invokeGetObuInfo(data.toString()) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index c32a366d08..d9ab7a8190 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -588,6 +588,16 @@ internal class DebugSettingView @JvmOverloads constructor( } } + //obu设置50ms的频率发送数据 + btnSetFifty.setOnClickListener { + CallerObuApiManager.setHvInfoSendCycle(50) + } + + //obu设置100ms的频率发送数据 + btnSetOneHundred.setOnClickListener { + CallerObuApiManager.setHvInfoSendCycle(100) + } + btnDrawFusion.isChecked = FunctionBuildConfig.isFusionColor btnDrawFusion.setOnCheckedChangeListener { _, isChecked -> FunctionBuildConfig.isFusionColor = isChecked diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index fbd4be94fa..6fbfba7dcb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1091,7 +1091,7 @@ app:layout_constraintTop_toTopOf="@id/btnSetObuIP" /> + + +