[610]移除刹车相关日志
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package com.mogo.eagle.core.function.datacenter.autopilot.adapter
|
package com.mogo.eagle.core.function.datacenter.autopilot.adapter
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import bag_manager.BagManagerOuterClass
|
import bag_manager.BagManagerOuterClass
|
||||||
import chassis.ChassisStatesOuterClass
|
import chassis.ChassisStatesOuterClass
|
||||||
import chassis.VehicleStateOuterClass
|
import chassis.VehicleStateOuterClass
|
||||||
@@ -164,9 +163,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
|
|||||||
vehicleState: VehicleStateOuterClass.VehicleState?
|
vehicleState: VehicleStateOuterClass.VehicleState?
|
||||||
) {
|
) {
|
||||||
if (vehicleState != null) {
|
if (vehicleState != null) {
|
||||||
Log.i(
|
|
||||||
"xfk",
|
|
||||||
"底盘 onVehicleState 刹车=${vehicleState.brake}")
|
|
||||||
//转向灯数据
|
//转向灯数据
|
||||||
CallerChassisLamplightListenerManager.invokeAutopilotLightSwitchData(vehicleState.light)
|
CallerChassisLamplightListenerManager.invokeAutopilotLightSwitchData(vehicleState.light)
|
||||||
//刹车灯数据
|
//刹车灯数据
|
||||||
@@ -256,9 +252,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
|
|||||||
CallerChassisThrottleStateListenerManager.invokeAutopilotThrottle(it.throttleResponsePosition)
|
CallerChassisThrottleStateListenerManager.invokeAutopilotThrottle(it.throttleResponsePosition)
|
||||||
}
|
}
|
||||||
chassisStates.brakeSystemStates?.let {
|
chassisStates.brakeSystemStates?.let {
|
||||||
Log.i(
|
|
||||||
"xfk",
|
|
||||||
"底盘 onVehicleState 刹车=${it.brakePedalResponsePosition}")
|
|
||||||
//刹车
|
//刹车
|
||||||
CallerChassisBrakeStateListenerManager.invokeAutopilotBrake(it.brakePedalResponsePosition)
|
CallerChassisBrakeStateListenerManager.invokeAutopilotBrake(it.brakePedalResponsePosition)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.mogo.eagle.core.function.call.autopilot
|
package com.mogo.eagle.core.function.call.autopilot
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener
|
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener
|
||||||
import com.mogo.eagle.core.function.call.base.CallerBase
|
import com.mogo.eagle.core.function.call.base.CallerBase
|
||||||
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason
|
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason
|
||||||
@@ -18,7 +17,6 @@ object CallerAutopilotActionsListenerManager : CallerBase<IMoGoAutopilotActionsL
|
|||||||
init {
|
init {
|
||||||
isAutopilotAbility = false
|
isAutopilotAbility = false
|
||||||
unableAutopilotReasons = disconnectedReason()
|
unableAutopilotReasons = disconnectedReason()
|
||||||
// printLog("初始化")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun disconnectedReason(): ArrayList<UnableLaunchReason> {
|
private fun disconnectedReason(): ArrayList<UnableLaunchReason> {
|
||||||
@@ -54,7 +52,6 @@ object CallerAutopilotActionsListenerManager : CallerBase<IMoGoAutopilotActionsL
|
|||||||
this.isAutopilotAbility = isConnected
|
this.isAutopilotAbility = isConnected
|
||||||
unableAutopilotReasons = if (isConnected) null else disconnectedReason()
|
unableAutopilotReasons = if (isConnected) null else disconnectedReason()
|
||||||
notification()
|
notification()
|
||||||
// printLog("更新数据 连接状态变更")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,9 +59,6 @@ object CallerAutopilotActionsListenerManager : CallerBase<IMoGoAutopilotActionsL
|
|||||||
fun invokeAutopilotAbility(
|
fun invokeAutopilotAbility(
|
||||||
isAutopilotAbility: Boolean, unableAutopilotReasons: ArrayList<UnableLaunchReason>?
|
isAutopilotAbility: Boolean, unableAutopilotReasons: ArrayList<UnableLaunchReason>?
|
||||||
) {
|
) {
|
||||||
Log.i(
|
|
||||||
"xfk",
|
|
||||||
"CallerAutopilotActionsListenerManager invokeAutopilotAbility=${CallerAutopilotActionsListenerManager.isAutopilotAbility} ${(if (CallerAutopilotActionsListenerManager.unableAutopilotReasons == null) null else CallerAutopilotActionsListenerManager.unableAutopilotReasons.toString())}")
|
|
||||||
if (isConnected) {
|
if (isConnected) {
|
||||||
var isEquals: Boolean = true
|
var isEquals: Boolean = true
|
||||||
if (unableAutopilotReasons != null && this.unableAutopilotReasons != null) {
|
if (unableAutopilotReasons != null && this.unableAutopilotReasons != null) {
|
||||||
@@ -73,41 +67,22 @@ object CallerAutopilotActionsListenerManager : CallerBase<IMoGoAutopilotActionsL
|
|||||||
this.unableAutopilotReasons?.let { old ->
|
this.unableAutopilotReasons?.let { old ->
|
||||||
old.sortWith(compareBy(UnableLaunchReason::hashCode));
|
old.sortWith(compareBy(UnableLaunchReason::hashCode));
|
||||||
isEquals = onw.toTypedArray() contentEquals old.toTypedArray()
|
isEquals = onw.toTypedArray() contentEquals old.toTypedArray()
|
||||||
// Log.i(
|
|
||||||
// "ddd",
|
|
||||||
// "都不为null时=${isEquals}=${this.isAutopilotAbility} ${(if (this.unableAutopilotReasons == null) null else this.unableAutopilotReasons.toString())}"
|
|
||||||
// )
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else isEquals =
|
} else isEquals =
|
||||||
!(unableAutopilotReasons != null || this.unableAutopilotReasons != null)
|
!(unableAutopilotReasons != null || this.unableAutopilotReasons != null)
|
||||||
// Log.i(
|
|
||||||
// "ddd",
|
|
||||||
// " 两个List是否相同=${isEquals} 新是否能启动自驾=${isAutopilotAbility} 老是否能启动自驾=${this.isAutopilotAbility} 新List是否为空=${unableAutopilotReasons == null} 老List是否为空=${this.unableAutopilotReasons == null}"
|
|
||||||
// )
|
|
||||||
if (this.isAutopilotAbility != isAutopilotAbility || !isEquals) {
|
if (this.isAutopilotAbility != isAutopilotAbility || !isEquals) {
|
||||||
this.isAutopilotAbility = isAutopilotAbility
|
this.isAutopilotAbility = isAutopilotAbility
|
||||||
this.unableAutopilotReasons = unableAutopilotReasons
|
this.unableAutopilotReasons = unableAutopilotReasons
|
||||||
notification()
|
notification()
|
||||||
// printLog("更新数据")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun notification() {
|
private fun notification() {
|
||||||
Log.i(
|
|
||||||
"xfk",
|
|
||||||
"CallerAutopilotActionsListenerManager 通知=${isAutopilotAbility} ${(if (unableAutopilotReasons == null) null else unableAutopilotReasons.toString())}")
|
|
||||||
M_LISTENERS.forEach {
|
M_LISTENERS.forEach {
|
||||||
val listener = it.value
|
val listener = it.value
|
||||||
listener.onAutopilotAbility(isAutopilotAbility, unableAutopilotReasons)
|
listener.onAutopilotAbility(isAutopilotAbility, unableAutopilotReasons)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// fun printLog(tag: String) {
|
|
||||||
// Log.i(
|
|
||||||
// "xfk",
|
|
||||||
// "${tag}=${isAutopilotAbility} ${(if (unableAutopilotReasons == null) null else unableAutopilotReasons.toString())}"
|
|
||||||
// )
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user