From 98c0d5001d8a0e28fa4784787e999a9c2834c215 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Wed, 8 May 2024 15:14:58 +0800 Subject: [PATCH 1/4] [6.4.0] remove log and add trace --- .../adapter/MoGoAdasMsgConnectStatusListenerImpl.kt | 10 +++++----- .../core/function/hmi/ui/setting/StatusSummaryView.kt | 7 ++++--- .../CallerAutopilotCarConfigListenerManager.kt | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 9e41f5caa3..659d8497bf 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/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", "域控证书链校验失败（表示证书链未验证通过。证书不匹配、证书格式不正确）" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 4245c24ed1..230d47388e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/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,7 +238,6 @@ 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("成功校验")){ 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 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt index a4c5d8d0f4..dbf75c5c27 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.call.autopilot -import android.util.Log import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.call.base.CallerBase import mogo.telematics.pad.MessagePad @@ -41,7 +40,6 @@ object CallerAutopilotCarConfigListenerManager : CallerBase Date: Wed, 8 May 2024 15:42:07 +0800 Subject: [PATCH 2/4] [6.4.0] fix ui bug --- .../eagle/core/function/hmi/ui/setting/StatusSummaryView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 230d47388e..4255d48076 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -239,7 +239,7 @@ class StatusSummaryView @JvmOverloads constructor( override fun authCrtFile(device: String, root: String) { super.authCrtFile(device, root) UiThreadHandler.post ({ - if(CallerAutopilotCarConfigListenerManager.getCertFileResult().contains("成功校验")){ + if(CallerAutopilotCarConfigListenerManager.getCertFileResult()!= "未开启认证"){ return@post } if (data.size < 6) return@post From 2c2217ac404a75373308d225114048ec9dbfb01e Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 8 May 2024 16:49:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[6.4.0][=E5=90=AF=E8=87=AA=E9=A9=BE?= =?UTF-8?q?=E6=8C=87=E5=BC=95]=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 8b5477263c..59e5465f2f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/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) } } } From 3f467b4f7adb35771e05fd7b3e14ce4a38324956 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 9 May 2024 14:42:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.4.0]=20[=E8=87=AA=E8=BA=AB=E8=87=AA?= =?UTF-8?q?=E9=A9=BE=E6=9D=A1=E4=BB=B6=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index ebd3871368..9807dd38ac 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -399,6 +399,7 @@ object TaxiTaskModel { override fun canStartAutopilot(canStart: Boolean) { super.canStartAutopilot(canStart) + mADASStatusCallback?.updateAutopilotStatus(CallerAutoPilotControlManager.isCanStartAutopilot(false)) } }