diff --git a/src/main/java/com/iflytop/handacid/app/core/listener/BleGamepadEventListener.java b/src/main/java/com/iflytop/handacid/app/core/listener/BleGamepadEventListener.java index e1b4410..6e17828 100644 --- a/src/main/java/com/iflytop/handacid/app/core/listener/BleGamepadEventListener.java +++ b/src/main/java/com/iflytop/handacid/app/core/listener/BleGamepadEventListener.java @@ -42,6 +42,10 @@ public class BleGamepadEventListener { if (CmdId.event_ble_gamepad_liquid_acid.equals(cmdId)) { //判断当前的设备状态 log.info("蓝牙手柄 加酸按钮 按下"); + if (deviceState.isSolutionPreFillStart()) {//正在预充 忽略加液按钮事件 + log.info("正在与预充中..."); + return; + } if (deviceState.isSolutionAdding()) { channelCtrlService.solutionAddStop(); } else { @@ -49,6 +53,10 @@ public class BleGamepadEventListener { } } else if (CmdId.event_ble_gamepad_liquid_acid_prefilling.equals(cmdId)) { log.info("蓝牙手柄 预充按钮 按下"); + if (deviceState.isSolutionAdding()) {//正在加液 忽略预充按钮事件 + log.info("正在加液中..."); + return; + } if (deviceState.isSolutionPreFillStart()) { channelCtrlService.solutionPreFillStop(); } else {