From ceba22346a7382a667fa153ff03ac43fee8d693d Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Sun, 28 Nov 2021 18:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=87=BB=E6=97=B6=E9=97=B4=E5=BB=B6?=
 =?UTF-8?q?=E9=95=BF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deviceservice.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/deviceservice.cpp b/deviceservice.cpp
index 45ae392..76ef88d 100644
--- a/deviceservice.cpp
+++ b/deviceservice.cpp
@@ -9,7 +9,7 @@
 #define WIRING_PIN_KEY 3    //GPIO.3
 #define Click_Overtime 50
 #define Press_Overtime 1500
-#define DblClick_Difftime 800
+#define DblClick_Difftime 2000
 
 DeviceService::DeviceService(QObject *parent) : QObject(parent)
 {
@@ -103,7 +103,8 @@ quint8 DeviceService::keyDetection()
     //判定上次有行为，且上次行为产生时间间隔大于组合行为最长时间间隔，说明行为结束（不在判定组合行为），发送行为信号，并清空key.flag
     if(key.flag != None && lastFlagTime.msecsTo(QTime::currentTime()) >= DblClick_Difftime)
     {
-        emit keyWorked(key.flag);
+//        emit keyWorked(key.flag);
+        qDebug() << "keyWorked = " << key.flag;
         key.flag = None;
     }
 
@@ -130,17 +131,14 @@ quint8 DeviceService::keyDetection()
     }
 
     //判定组合行为
-    if(flag != None)
+    if(flag == Click)
     {
-        if(flag == Click)
+        if(key.flag == Click)
         {
-            if(key.flag == Click)
-            {
-                flag = Dbl_Click;
-            }else if(key.flag == Dbl_Click)
-            {
-                flag = Tri_Click;
-            }
+            flag = Dbl_Click;
+        }else if(key.flag == Dbl_Click)
+        {
+            flag = Tri_Click;
         }
     }
 
@@ -149,10 +147,6 @@ quint8 DeviceService::keyDetection()
     {
         key.flag = flag;
         lastFlagTime = QTime::currentTime();
-        if(key.flag != None){
-//        emit keyWorked(key.flag);
-        qDebug() << "keyWorked = " << key.flag;
-        }
     }
 
     //记录按键按下时间