超级IC卡暂存

rfid/rfidmanager.h

@@ -8,6 +8,25 @@
 #include <QMutex>
 
 class SysPara;
+enum CARD_TYPE{
+    INK = 1,
+    SOLVENT = 2,
+    MAINTENANCE = 3,
+};
+
+struct StatuStruct
+{
+    bool addedInk;
+    bool addedSolvent;
+    bool cardInk;
+    bool cardSolvent;
+    StatuStruct() {
+        addedInk = false;
+        addedSolvent = false;
+        cardInk = false;
+        cardSolvent = false;
+    }
+};
 
 typedef unsigned char UCHAR;
 class RFIDManager : public QObject
@@ -67,6 +86,12 @@ private:
 
     bool cardTouchConfirm(QString msgTxt, QString variableMsgTxt);
 
+    //刷卡新需求，刷卡和倒溶剂/墨水不分先后，都可以去除报警提示。
+    StatuStruct status;
+    void updateStatus();
+    QTimer* warningTimer = nullptr;
+    bool waitStatus();
+    bool waitCard();
 signals:
     void sig_showMsg(QString msg);
 
@@ -79,6 +104,8 @@ private slots:
     //超时处理槽函数
     void slt_timerHandle();
 
+    //处理刷卡与溶剂/墨水报警标志
+    void slt_intervalTimerHandle();
 };
 
 #endif // RFIDMANAGER_H