Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

# Conflicts:
#	app/productFlavors/fMultiDisplayOchBus.gradle
#	app/productFlavors/fMultiDisplayOchTaxi.gradle
This commit is contained in:
yangyakun
2023-02-16 19:10:22 +08:00
10 changed files with 138 additions and 72 deletions

View File

@@ -1,5 +1,6 @@
package com.mogo.eagle.core.function.call.autopilot
import android.util.Log
import chassis.Chassis
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener
import com.mogo.eagle.core.function.call.base.CallerBase
@@ -17,24 +18,24 @@ object CallerChassisLamplightListenerManager : CallerBase<IMoGoChassisLamplightL
* @param lightSwitch
*/
fun invokeAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch) {
val switch = getTurnLightState(lightSwitch)
M_LISTENERS.forEach {
val listener = it.value
listener.onAutopilotLightSwitchData(getTurnLightState(lightSwitch))
listener.onAutopilotLightSwitchData(switch)
}
}
private fun getTurnLightState(turn_light: Chassis.LightSwitch): Chassis.LightSwitch? {
if (turn_light == Chassis.LightSwitch.LIGHT_NONE) {
return if (isOnTurnLight) {
if (turn_light.number == Chassis.LightSwitch.LIGHT_NONE.number) {
if (isOnTurnLight) {
if (turnLightTimes >= 10) {
isOnTurnLight = false
return turn_light
} else {
turnLightTimes++
null
}
turnLightTimes++
return null
} else {
null
return null
}
} else {
turnLightTimes = 0