|
@ -42,6 +42,10 @@ public class BleGamepadEventListener { |
|
|
if (CmdId.event_ble_gamepad_liquid_acid.equals(cmdId)) { |
|
|
if (CmdId.event_ble_gamepad_liquid_acid.equals(cmdId)) { |
|
|
//判断当前的设备状态 |
|
|
//判断当前的设备状态 |
|
|
log.info("蓝牙手柄 加酸按钮 按下"); |
|
|
log.info("蓝牙手柄 加酸按钮 按下"); |
|
|
|
|
|
if (deviceState.isSolutionPreFillStart()) {//正在预充 忽略加液按钮事件 |
|
|
|
|
|
log.info("正在与预充中..."); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
if (deviceState.isSolutionAdding()) { |
|
|
if (deviceState.isSolutionAdding()) { |
|
|
channelCtrlService.solutionAddStop(); |
|
|
channelCtrlService.solutionAddStop(); |
|
|
} else { |
|
|
} else { |
|
@ -49,6 +53,10 @@ public class BleGamepadEventListener { |
|
|
} |
|
|
} |
|
|
} else if (CmdId.event_ble_gamepad_liquid_acid_prefilling.equals(cmdId)) { |
|
|
} else if (CmdId.event_ble_gamepad_liquid_acid_prefilling.equals(cmdId)) { |
|
|
log.info("蓝牙手柄 预充按钮 按下"); |
|
|
log.info("蓝牙手柄 预充按钮 按下"); |
|
|
|
|
|
if (deviceState.isSolutionAdding()) {//正在加液 忽略预充按钮事件 |
|
|
|
|
|
log.info("正在加液中..."); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
if (deviceState.isSolutionPreFillStart()) { |
|
|
if (deviceState.isSolutionPreFillStart()) { |
|
|
channelCtrlService.solutionPreFillStop(); |
|
|
channelCtrlService.solutionPreFillStop(); |
|
|
} else { |
|
|
} else { |
|
|