From d2594a04309fd578e5b4d655dc4fd70e3e3bd68b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 13 Sep 2023 14:12:49 +0800 Subject: [PATCH] [6.1.0]extend the door state to 0,1,2 --- .../ui/startautopilot/StartAutopilotViewModel.kt | 8 ++++---- .../ui/startautopilot/StartAutopilotViewModel.kt | 8 ++++---- .../api/autopilot/IMoGoChassisDoorStateListener.kt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index 969d3a59a3..971ae44dff 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -76,10 +76,10 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac AutopilotManager.startAutopilot() } - override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, open: Boolean) { - super.onAutopilotSingleDoorState(num, open) - CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化:${num}--${open}") - exchangeEnum(num,open) + override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, state: Int) { + super.onAutopilotSingleDoorState(num, state) + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化:${num}--${state}") +// exchangeEnum(num,open) } private fun exchangeEnum(num: Chassis.DoorNumber,open: Boolean){ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index cb9fff3fc8..9394b1cc53 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -69,10 +69,10 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac AutopilotManager.startAutopilot() } - override fun onAutopilotSingleDoorState(num: DoorNumber, open: Boolean) { - super.onAutopilotSingleDoorState(num, open) - CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化:${num}--${open}") - exchangeEnum(num,open) + override fun onAutopilotSingleDoorState(num: DoorNumber, state: Int) { + super.onAutopilotSingleDoorState(num, state) + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化:${num}--${state}") +// exchangeEnum(num,open) } private fun exchangeEnum(num: DoorNumber,open: Boolean){ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisDoorStateListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisDoorStateListener.kt index d32139494c..2c7eee8cc0 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisDoorStateListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisDoorStateListener.kt @@ -16,7 +16,7 @@ interface IMoGoChassisDoorStateListener { /** * 单个车门状态回调(变化回调) * @param num 枚举 taxi(前左/右,后左/右) / bus(中) - * @param open true:开门(1), false:关门(0) + * @param state 关门(0),开门(1),未知(2), */ - fun onAutopilotSingleDoorState(num:DoorNumber, open:Boolean){} + fun onAutopilotSingleDoorState(num:DoorNumber, state:Int){} } \ No newline at end of file