diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index de71747d21..bcf11f56ee 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL -import com.mogo.eagle.core.utilcode.mogo.toast.TipToast +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasConnectStatusListener import com.zhidao.support.adas.high.common.Constants @@ -44,8 +44,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = AdasManager.getInstance().ipcConnectedPort CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true - CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() - // 同步SN给工控机 syncBasicInfoToAutopilot() // 开启轮询上传自动驾驶状态 @@ -55,7 +53,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason") if (connectStatus) { reason?.let { - TipToast.shortTip("工控机连接断开,原因:$it , 等待重连") + ToastUtils.showLong("工控机连接断开,原因:$it , 等待重连") } connectStatus = false } @@ -69,7 +67,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, mCurrentAutopilotSpeed = 0.0f CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0 - CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTING) { CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接") } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS) { @@ -77,6 +74,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS) { CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") } + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatusDescribe=reason + CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() } /** 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 3ab3c27cc9..99fb82b0f5 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 @@ -60,6 +60,7 @@ import com.mogo.eagle.core.utilcode.util.* import com.mogo.map.MogoMap import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* +import com.zhidao.easysocket.utils.L import kotlinx.android.synthetic.main.view_debug_setting.view.* import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -1039,6 +1040,13 @@ class DebugSettingView @JvmOverloads constructor( MoGoAiCloudClientConfig.getInstance().isShowNetDebugLog = isChecked } + /** + * 设置是否输出OBU日志 true-打印日志,false-不打印日志 + */ + tbObuLog.setOnCheckedChangeListener { _, isChecked -> + L.setEnableLog(isChecked) + } + cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus() //链路Log输出日志 cbTraceLog.setOnCheckedChangeListener { _, isChecked -> @@ -1169,8 +1177,9 @@ class DebugSettingView @JvmOverloads constructor( it.iterator().forEach {map -> val name = if(map.key.contains("{")) map.key.replace("{","") else map.key val url = if(map.value.contains("}")) map.value.replace("}","") else map.value - upgradeVersionList.add(UpgradeVersionEntity(name,url)) + upgradeVersionList.add(UpgradeVersionEntity(name.trim(),url)) } + upgradeVersionList.sortByDescending { upgradeVersionEntity ->upgradeVersionEntity.name } upgradeListAdapter?.setDada(dataFilter(upgradeVersionList)) upgradeListAdapter?.notifyDataSetChanged() } @@ -1408,7 +1417,11 @@ class DebugSettingView @JvmOverloads constructor( tvObuSdkVersion.text = "OBU-SDK版本:${AppConfigInfo.obuSdkVersion}" tvAutopilotProtocolVersionInfo.text = "Autopilot协议版本:${CallerAutoPilotManager.getProtocolVersion()}" - tvIpcProtocolVersionInfo.text = "工控机协议版本:${AppConfigInfo.protocolVersionNumber}" + if(AppConfigInfo.protocolVersionNumber==0){ + tvIpcProtocolVersionInfo.text="工控机协议版本:未知" + }else{ + tvIpcProtocolVersionInfo.text = "工控机协议版本:${AppConfigInfo.protocolVersionNumber}" + } tvMoGoMapVersion.text = "HD-Map版本:${MogoMap.getInstance().mogoMap.mapVersion}" tvGitBranchInfo.text = "Git分支:${AppConfigInfo.workingBranchName}" tvGitHashInfo.text = "Git-Hash:${AppConfigInfo.workingBranchHash}" @@ -1464,11 +1477,17 @@ class DebugSettingView @JvmOverloads constructor( ) tvAutopilotConnectStatus.text = Html.fromHtml( - "Autopilot系统连接状态:${ + "工控机连接状态:${ if (AppConfigInfo.isConnectAutopilot) { "正常" } else { - "异常" + "异常 原因:${ + if(AppConfigInfo.connectStatusDescribe.isNullOrEmpty()){ + "主动断开连接" + }else{ + AppConfigInfo.connectStatusDescribe + } + }" } }" ) @@ -1565,14 +1584,16 @@ class DebugSettingView @JvmOverloads constructor( override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { mAutoPilotStatusInfo = autoPilotStatusInfo AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus - if (autoPilotStatusInfo.connectStatus) { - adasConnectStatus = true - } + AppConfigInfo.connectStatusDescribe = autoPilotStatusInfo.connectStatusDescribe + +// if (autoPilotStatusInfo.connectStatus) { +// adasConnectStatus = true +// } //ADAS断开连接,提示异常 - if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) { - adasConnectStatus = false - toastMsg("Autopilot系统连接状态异常") - } +// if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) { +// adasConnectStatus = false +// toastMsg("工控机连接断开") +// } } override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) { @@ -1609,7 +1630,7 @@ class DebugSettingView @JvmOverloads constructor( carConfigResp.let { AppConfigInfo.plateNumber = it.plateNumber//车牌号 AppConfigInfo.iPCMacAddress = it.macAddress//工控机MAC地址 - AppConfigInfo.protocolVersionNumber = it.protocolVersion.number//工控机协议版本 + AppConfigInfo.protocolVersionNumber = it.protocolVersionValue//工控机协议版本 } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 7d24f05068..df3a586bdc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1432,6 +1432,18 @@ android:textSize="@dimen/dp_24" /> + + +