Merge branch 'dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0_bailing

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt

@@ -251,7 +251,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
      */
     override fun onCertification(status: AdasConstants.CertificationStatus) {
         if (status == AdasConstants.CertificationStatus.TIMEOUT) {
-            certificationResult = "：证书认证超时"
+            certificationResult = "证书认证超时"
             CallerLogger.d(
                 "$M_D_C$TAG",
                 "域控证书认证超时（表示域控未发送BasicInfoReq接口的数据【这种情况可能是连接出现了问题】）"
@@ -259,25 +259,25 @@ class MoGoAdasMsgConnectStatusListenerImpl :
         } else {
             if (status != AdasConstants.CertificationStatus.NOT_ENABLED) {
                 if (status == AdasConstants.CertificationStatus.CERTIFICATE_CHAIN_SUCCESS) {
-                    certificationResult = "：成功校验域控证书"
+                    certificationResult = "成功校验域控证书"
                     CallerLogger.d(
                         "$M_D_C$TAG",
                         "成功校验域控证书"
                     )
                 } else if (status == AdasConstants.CertificationStatus.ROOT_CRT_ERROR) {
-                    certificationResult = "：获取ROOT证书异常"
+                    certificationResult = "获取ROOT证书异常"
                     CallerLogger.d(
                         "$M_D_C$TAG",
                         "ROOT证书异常（表示未传递证书，没有拿到ROOT证书）"
                     )
                 } else if (status == AdasConstants.CertificationStatus.IPC_CRT_ERROR) {
-                    certificationResult = "：获取域控证书异常"
+                    certificationResult = "获取域控证书异常"
                     CallerLogger.d(
                         "$M_D_C$TAG",
                         "域控证书异常（表示域控发送了BasicInfoReq接口的数据但是未传递证书或证书解码失败【失败的可能性很低】）"
                     )
                 } else if (status == AdasConstants.CertificationStatus.CERTIFICATE_CHAIN_FAILED) {
-                    certificationResult = "：域控证书校验失败"
+                    certificationResult = "域控证书校验失败"
                     CallerLogger.d(
                         "$M_D_C$TAG",
                         "域控证书链校验失败（表示证书链未验证通过。证书不匹配、证书格式不正确）"

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -175,6 +175,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
             block.start()
         }
         AppStateManager.registerAppStateListener(this)
+        StatusManager.addListener(TAG, statusListener)
     }
 
     override fun onAppStateChanged(isForeground: Boolean) {
@@ -187,7 +188,6 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
                         continue
                     }
                     StatusManager.init(activity)
-                    StatusManager.addListener(TAG, statusListener)
                 }
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt

@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.setting
 
 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,6 +11,7 @@ import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.commons.storage.SharedPrefsMgr
+import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.status.StatusSummaryEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
@@ -26,6 +26,8 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicStatusListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
+import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
 import com.mogo.eagle.core.utilcode.kotlin.PX
 import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -236,9 +238,8 @@ class StatusSummaryView @JvmOverloads constructor(
 
     override fun authCrtFile(device: String, root: String) {
         super.authCrtFile(device, root)
-        Log.i("emArrow","authCrtFile : $device, certFileResult: ${CallerAutopilotCarConfigListenerManager.getCertFileResult()}")
         UiThreadHandler.post ({
-            if(CallerAutopilotCarConfigListenerManager.getCertFileResult().contains("成功校验")){
+            if(CallerAutopilotCarConfigListenerManager.getCertFileResult()!= "未开启认证"){
                 return@post
             }
             if (data.size < 6) return@post
@@ -260,7 +261,7 @@ class StatusSummaryView @JvmOverloads constructor(
 
     override fun onCertificationResult(msg: String) {
         super.onCertificationResult(msg)
-        Log.i("emArrow","onCertificationResult : $msg")
+        hmiAction("证书验证状态", msg, true)
         if (!SharedPrefsMgr.getInstance().getBoolean(
                 "${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}",
                 MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE