From fa87ec22144e90f99e81ab221ed3e4ee8ef6bfd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Fri, 1 Aug 2025 10:08:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E6=B6=B2=E4=B8=AD?=
 =?UTF-8?q?=20=E9=A2=84=E5=85=85=E4=B8=AD=E8=93=9D=E7=89=99=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handacid/app/core/listener/BleGamepadEventListener.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

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 {