yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[630][adas] 修复处于PING状态时，无法停止PING问题

Browse Source
This commit is contained in:
xinfengkun
2024-03-15 13:59:47 +08:00
parent fec3d1b8dc
commit 8a8d0bf56a
11 changed files with 251 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
View File

@@ -76,7 +76,7 @@ object AppConfigInfo {
var isConnectAutopilot: Boolean = false
//连接工控机状态文字描述
var connectStatusDescribe: String? = null
var connectStatusDescribe: String = "未连接"
// 是否OBU
var isConnectObu: Boolean = false

10
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
View File

@@ -23,9 +23,9 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
var connectStatus = false
/**
* 工控机连接状态文字描述
* 工控机连接状态返回的Reason
*/
var connectStatusDescribe: String? = null
var connectStatusReason: String? = null
var version: String? = null
/**
@@ -78,11 +78,11 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
var isArriveAtStation: Boolean = false
override fun toString(): String {
return "connectIP=$connectIP, connectPort=$connectPort, " +
"connectStatus=$connectStatus, connectDescribe=$connectStatusDescribe, version=$version, dockVersion=$dockVersion," +
return "IPCConnectIP=$connectIP, IPCConnectPort=$connectPort, " +
"IPCConnected=$connectStatus, IPCConnectStatus=$ipcConnStatus, IPCConnectDescribe=$connectStatusReason, version=$version, dockVersion=$dockVersion," +
" locationStatus=$locationStatus), locationLat=$locationLat, locationLon=$locationLon," +
" satelliteTime=$satelliteTime, state=$state, " +
" pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus, autopilotControlParameters=$autopilotControlParameters"
" pilotmode=$pilotmode, autopilotControlParameters=$autopilotControlParameters"
}
public override fun clone(): AutopilotStatusInfo {

1
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
View File

@@ -13,6 +13,7 @@ object MoGoConfig {
const val AUTOPILOT_IP = "AUTOPILOT_IP"
//调试窗控制连接域控时是否启用认证存储key
const val AUTOPILOT_CERTIFICATION = "AUTOPILOT_CERTIFICATION"
const val AUTOPILOT_CERTIFICATION_DEFAULT_VALUE = false
// CMD全量日志抓取
const val CATCH_LOG = "CATCH_LOG"