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

This commit is contained in:
yangyakun
2024-05-09 18:03:27 +08:00
5 changed files with 12 additions and 12 deletions

View File

@@ -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