From 94a8d842d9d936c6b06ca1d1dacd6ab52cdd5863 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 2 Sep 2024 14:41:08 +0800
Subject: [PATCH] v103

---
 README.md                                         |  3 ++-
 usrc/service/remote_controler_event_processer.cpp | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1a5449b..276f00d 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@ V102:
     1.设备在工作时，禁止离开首页
     2.设备在工作时，禁止切换模式
 
-
+V103:
+    1. fix some bug
 
 ```
 
diff --git a/usrc/service/remote_controler_event_processer.cpp b/usrc/service/remote_controler_event_processer.cpp
index b215b24..2ca8bca 100644
--- a/usrc/service/remote_controler_event_processer.cpp
+++ b/usrc/service/remote_controler_event_processer.cpp
@@ -92,22 +92,30 @@ void RemoteControlerEventProcesser::processKeyEventFromRemoter(hand_acid_remoter
   /**
    * @brief 如果当前设备处于工作中，则无论什么按键都是停止工作
    */
-
-  if (UIS->getNowPage() == pg_login || UIS->getNowPage() == pg_pStart || UIS->getNowPage() == pg_muBleHandSett || UIS->getNowPage() == pg_muPumpTest) {
-    return;
-  }
-
   if (PUMPCS->isWorking()) {
     PUMPCS->stop();
     RCTRL->setRemoterState(GSM->getRunMode(), PUMPCS->isWorking());
     return;
   }
 
+  /**
+   * @brief 下面几个页面蓝牙手柄按下，不做任何反应
+   */
+  if (UIS->getNowPage() == pg_login || UIS->getNowPage() == pg_pStart || UIS->getNowPage() == pg_muBleHandSett || UIS->getNowPage() == pg_muPumpTest) {
+    return;
+  }
+
+  /**
+   * @brief 如果不在首页，则报警
+   */
   if (UIS->getNowPage() != pg_main) {
     UIS->alert("请先切换到首页,在控制设备");
     return;
   }
 
+  /**
+   * @brief 操作设备
+   */
   if (keyEvent == hand_acid_remoter_kevent_add_liquid) {
     //
     if (!GSM->isHasPumpSelect()) {
@@ -132,6 +140,10 @@ void RemoteControlerEventProcesser::processKeyEventFromRemoter(hand_acid_remoter
     PUMPCS->reflux();
   } else if (keyEvent == hand_acid_remoter_kevent_preFilling) {
     // 管路填充
+    if (!GSM->isHasPumpSelect()) {
+      UIS->alert("请至少选中一个通道");
+      return;
+    }
     PUMPCS->acidPrefilling();
   }
 }