Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

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,
@@ -410,13 +418,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
-
             }
         }
 
@@ -1620,7 +1626,6 @@ internal class DebugSettingView @JvmOverloads constructor(
         tvRouteInfoSizeCopy.text =
             "全局路径规划点个数：${mRouteInfoSize}"
 
-
         // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况
         mIdentifyDataSize = 0
         mUnknownIdentifyDataSize = 0
@@ -1635,13 +1640,7 @@ internal class DebugSettingView @JvmOverloads constructor(
 
         //obu TODO 后面会添加很多os那边需要显示的内容
         obuVersionNameTv.text = Html.fromHtml(
-            "OBU版本号：${
-                if (AppConfigInfo.isConnectObu) {
-                    "<font color='blue'> 1.0"
-                } else {
-                    "<font color='red'>异常"
-                }
-            }"
+            "OBU版本号：$mObuVersionName"
         )
 
         obuConnectStatusTv.text = Html.fromHtml(
@@ -1654,7 +1653,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             }"
         )
 
-
     }
 
     /**
@@ -2053,4 +2051,11 @@ internal class DebugSettingView @JvmOverloads constructor(
         setLogCheckedChangeListener()
     }
 
+    override fun onGetObuVersionName(obuVersionName: String) {
+        mObuVersionName = obuVersionName
+    }
+
+    override fun onObuDeviceId(obuDeviceId: String) {
+        mObuDeviceId = obuDeviceId
+    }
 }