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 6046849510..ec4ff4a718 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 @@ -109,7 +109,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { override fun onCurrentVersion(version: MogoObuSystemBConfigData) { CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onCurrentVersion version = ${version.version}") if (!version.version.isNullOrEmpty()) { - CallerObuInfoListenerManager.invokeObuVersionName(version.version) CallerDevaToolsManager.queryObuUpgrade(version.version) } } @@ -200,7 +199,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * @param data 系统状态 */ override fun onObuSystemStatus(data: MogoObuSystemStatusData?) { - + 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 238937f3a7..eba7451134 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 @@ -152,8 +152,7 @@ internal class DebugSettingView @JvmOverloads constructor( //OBU连接状态 private var obuConnectStatus: Boolean = false - private var mObuVersionName: String = "" - private var mObuDeviceId: String = "" + private var mObuInfoStr: String = "" //渠道包标签 private var onlineSelected: Boolean = true @@ -1527,7 +1526,6 @@ internal class DebugSettingView @JvmOverloads constructor( }" ) - tvServerSocketStatus.text = Html.fromHtml( "服务器Socket状态:${ if (MogoStatusManager.getInstance().isSocketOnLine) { @@ -1635,10 +1633,8 @@ internal class DebugSettingView @JvmOverloads constructor( tbIsDemoMode.text = "开启美化模式" } - //obu TODO 后面会添加很多os那边需要显示的内容 - obuVersionNameTv.text = Html.fromHtml( - "OBU信息:$mObuVersionName" - ) + //obu信息,排查obu相关问题使用 + tvObuInfoContent.text = mObuInfoStr obuConnectStatusTv.text = Html.fromHtml( "OBU连接状态:${ @@ -2048,12 +2044,7 @@ internal class DebugSettingView @JvmOverloads constructor( setLogCheckedChangeListener() } - override fun onGetObuVersionName(obuVersionName: String) { - mObuVersionName = obuVersionName + override fun onGetObuInfo(obuInfoStr: String) { + mObuInfoStr = obuInfoStr } - - override fun onObuDeviceId(obuDeviceId: String) { - mObuDeviceId = obuDeviceId - } - } \ No newline at end of file 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 d044cb3c01..20f98d2738 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 @@ -1117,13 +1117,19 @@ - + diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/IMoGoObuInfoListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/IMoGoObuInfoListener.kt index 82703fba36..f4c9d0dcfd 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/IMoGoObuInfoListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/IMoGoObuInfoListener.kt @@ -9,14 +9,8 @@ package com.mogo.eagle.core.function.api.datacenter.obu interface IMoGoObuInfoListener { /** - * @param obuVersionName OBU硬件版本 + * @param obuInfoStr OBU信息 */ - fun onGetObuVersionName(obuVersionName: String) - - /** - * obuDeviceId - */ - fun onObuDeviceId(obuDeviceId: String) - + fun onGetObuInfo(obuInfoStr: String) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt index de793b087d..b93cf4932e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt @@ -9,25 +9,12 @@ import com.mogo.eagle.core.function.call.base.CallerBase */ object CallerObuInfoListenerManager : CallerBase() { - fun invokeObuVersionName(obuVersionName: String) { + fun invokeGetObuInfo(obuInfoStr: String) { M_LISTENERS.forEach { val listener = it.value - listener.onGetObuVersionName(obuVersionName) + listener.onGetObuInfo(obuInfoStr) } } - fun invokeObuDeviceId(obuDeviceId: String) { - M_LISTENERS.forEach { - val listener = it.value - listener.onObuDeviceId(obuDeviceId) - } - } - -// fun invokeQueryContainersResponse(dockerList: List) { -// M_LISTENERS.forEach { -// val listener = it.value -// //TODO -// } -// } } \ No newline at end of file