From b1fe51d18261a70cb3a80863ef7cfc91f039671a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 1 Mar 2023 11:41:57 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E6=B7=BB=E5=8A=A0ob?= =?UTF-8?q?u=20=E7=9A=84versionName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obu/MogoPrivateObuNewManager.kt | 6 ++-- .../hmi/ui/setting/DebugSettingView.kt | 31 +++++++++-------- .../function/api/obu/IMoGoObuInfoListener.kt | 22 +++++++++++++ .../call/obu/CallerObuInfoListenerManager.kt | 33 +++++++++++++++++++ 4 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuInfoListener.kt create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt 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 a4b0d19ddb..d21d336e8d 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 @@ -13,10 +13,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager -import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager -import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager -import com.mogo.eagle.core.function.call.obu.CallerObuSaveMessageListenerManager -import com.mogo.eagle.core.function.call.obu.CallerObuWarningListenerManager +import com.mogo.eagle.core.function.call.obu.* import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew @@ -114,6 +111,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onCurrentVersion version = ${version.version}") if (!version.version.isNullOrEmpty()) { mVersionName = version.version + CallerObuInfoListenerManager.invokeObuVersionName(version.version) CallerDevaToolsManager.queryObuUpgrade(version.version) } } 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 7af658d49d..c1774af554 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 @@ -46,6 +46,7 @@ import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.api.obu.IMoGoObuConnectListener +import com.mogo.eagle.core.function.api.obu.IMoGoObuInfoListener import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager @@ -54,6 +55,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.obu.CallerObuApiManager import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager +import com.mogo.eagle.core.function.call.obu.CallerObuInfoListenerManager import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R @@ -107,7 +109,8 @@ internal class DebugSettingView @JvmOverloads constructor( IMoGoChassisGearStateListener, IMoGoChassisBrakeStateListener, IMoGoChassisThrottleStateListener, - IMoGoSweeperFutianCleanSystemListener { + IMoGoSweeperFutianCleanSystemListener, + IMoGoObuInfoListener { private val TAG = "DebugSettingView" @@ -139,6 +142,8 @@ internal class DebugSettingView @JvmOverloads constructor( //OBU连接状态 private var obuConnectStatus: Boolean = false + private var mObuVersionName: String = "" + private var mObuDeviceId: String = "" //渠道包标签 private var onlineSelected: Boolean = true @@ -217,6 +222,8 @@ internal class DebugSettingView @JvmOverloads constructor( //查询工控机基础配置信息 CallerAutoPilotControlManager.getCarConfig() } + + CallerObuInfoListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { @@ -244,7 +251,8 @@ internal class DebugSettingView @JvmOverloads constructor( CallerDevaToolsListenerManager.removeListener(TAG) // 移除 底盘灯光数据 监听 CallerChassisLamplightListenerManager.removeListener(TAG) - + // 移除 obu获取信息 监听 + CallerObuInfoListenerManager.removeListener(TAG) // 移除 业务配置监听 CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, @@ -400,13 +408,11 @@ internal class DebugSettingView @JvmOverloads constructor( //展示OBU控制中心 obuControllerLayout.visibility = View.VISIBLE tbVehicleStateController.isChecked = true - } else { buttonView.setCompoundDrawables(null, null, iconRight, null) //隐藏OBU控制中心 obuControllerLayout.visibility = View.GONE tbVehicleStateController.isChecked = false - } } @@ -1610,7 +1616,6 @@ internal class DebugSettingView @JvmOverloads constructor( tvRouteInfoSizeCopy.text = "全局路径规划点个数：${mRouteInfoSize}" - // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况 mIdentifyDataSize = 0 mUnknownIdentifyDataSize = 0 @@ -1625,13 +1630,7 @@ internal class DebugSettingView @JvmOverloads constructor( //obu TODO 后面会添加很多os那边需要显示的内容 obuVersionNameTv.text = Html.fromHtml( - "OBU版本号：${ - if (AppConfigInfo.isConnectObu) { - " 1.0" - } else { - "异常" - } - }" + "OBU版本号：$mObuVersionName" ) obuConnectStatusTv.text = Html.fromHtml( @@ -1644,7 +1643,6 @@ internal class DebugSettingView @JvmOverloads constructor( }" ) - } /** @@ -2043,4 +2041,11 @@ internal class DebugSettingView @JvmOverloads constructor( setLogCheckedChangeListener() } + override fun onGetObuVersionName(obuVersionName: String) { + mObuVersionName = obuVersionName + } + + override fun onObuDeviceId(obuDeviceId: String) { + mObuDeviceId = obuDeviceId + } } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuInfoListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuInfoListener.kt new file mode 100644 index 0000000000..07d230ff88 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuInfoListener.kt @@ -0,0 +1,22 @@ +package com.mogo.eagle.core.function.api.obu + + +/** + * OBU 显示信息 + * @author lixiaopeng + * @date 2023/2/28 + */ +interface IMoGoObuInfoListener { + + /** + * @param obuVersionName OBU硬件版本 + */ + fun onGetObuVersionName(obuVersionName: String) + + /** + * obuDeviceId + */ + fun onObuDeviceId(obuDeviceId: 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 new file mode 100644 index 0000000000..aa331196c8 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt @@ -0,0 +1,33 @@ +package com.mogo.eagle.core.function.call.obu + +import com.mogo.eagle.core.function.api.obu.IMoGoObuInfoListener +import com.mogo.eagle.core.function.call.base.CallerBase + +/** + * 一些obu的信息，用于排查obu硬件问题 + * + */ +object CallerObuInfoListenerManager : CallerBase() { + + fun invokeObuVersionName(obuVersionName: String) { + M_LISTENERS.forEach { + val listener = it.value + listener.onGetObuVersionName(obuVersionName) + } + } + + 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