[670][adas][data-center] FSM2024升级;SM2024数据解析兼容,如果RepeatedPilotNotStandbyReason没有数据将获取PilotNotStandbyReason赋值到RepeatedPilotNotStandbyReason中;老版本fsm2024 pb中没有beautiful_mode和beautiful_mode字段,域控给的新pb这两个字段标识符为required,当连接老板域控时将会解析包错,估修改为optional修饰
This commit is contained in:
@@ -15,8 +15,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
|
||||
import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager
|
||||
import com.mogo.eagle.core.function.main.MainLauncherActivity
|
||||
import com.mogo.eagle.core.utilcode.util.ToastUtils
|
||||
import com.zhjt.mogo.adas.data.bean.MogoReport
|
||||
import com.zhjt.mogo.adas.data.bean.LaunchConditionData
|
||||
import com.zhjt.mogo.adas.data.bean.MogoReport
|
||||
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason
|
||||
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason.SourceType.CHASSIS
|
||||
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason.UnableType.CHASSIS_BRAKE
|
||||
@@ -154,7 +154,12 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_GEAR, "gear")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_GEAR,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("gear")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -169,7 +174,12 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_STEERING, "steering")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_STEERING,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("steering")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -185,7 +195,12 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_BRAKE, "brake")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_BRAKE,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("brake")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -200,7 +215,12 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_HAZARD_LIGHTS, "lights")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_HAZARD_LIGHTS,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("lights")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -215,7 +235,12 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_THROTTLE, "throttle")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_THROTTLE,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("throttle")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -230,11 +255,36 @@ class TestAutoPilotBeforeLaunch {
|
||||
.setRemotePilotReady(false).build(),
|
||||
FSMStatusReasonRespond.getDefaultInstance()
|
||||
), ArrayList<UnableLaunchReason>().also {
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_GEAR, "gear")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_STEERING, "steering")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_HAZARD_LIGHTS, "lights")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_THROTTLE, "throttle")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_BRAKE, "brake")
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_GEAR,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("gear")
|
||||
}
|
||||
})
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_STEERING,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("steering")
|
||||
}
|
||||
})
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_HAZARD_LIGHTS,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("lights")
|
||||
}
|
||||
})
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_THROTTLE,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("throttle")
|
||||
}
|
||||
})
|
||||
it += UnableLaunchReason(CHASSIS, CHASSIS_BRAKE,
|
||||
object : ArrayList<String>() {
|
||||
init {
|
||||
add("brake")
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
CallerAutoPilotControlManager.isCanStartAutopilot(true)
|
||||
|
||||
Reference in New Issue
Block a user