重构RFID前

MainInstruction.cpp

@@ -2,6 +2,7 @@
 #include "ui_MainInstruction.h"
 #include <QMessageBox>
 #include <QDebug>
+#include "DlgRFIDConfig.h"
 
 MainInstruction::MainInstruction(QWidget *parent) :
     QWidget(parent),
@@ -17,10 +18,14 @@ MainInstruction::MainInstruction(QWidget *parent) :
     connect(ui->sysSetBtn, &QPushButton::clicked, this, std::bind(&MainInstruction::onSpecialButtonClicked, this, 3));
     connect(ui->otherSetBtn, &QPushButton::clicked, this, std::bind(&MainInstruction::onSpecialButtonClicked, this, 4));
     connect(ui->sysUpdateBtn,&QPushButton::clicked, this, std::bind(&MainInstruction::onSpecialButtonClicked, this, 5));
+
     // 其他信号槽连接在ui文件中
 
     dlgInputAddr = new DlgInputAddr(parent);
     dialogAuthorization = new DialogAuthorization(parent);
+    dlgRfidConfig = new DlgRFIDConfig(this);
+
+    connect(dlgRfidConfig, &DlgRFIDConfig::accepted, this, &MainInstruction::onRFIDAutoConfirmTimeoutChanged);
 
     dlgInputAddr->GetAddr();
     dlgInputAddr->vpnConnect();
@@ -244,6 +249,19 @@ void MainInstruction::slt_timeSetting()
     sysPara->devOp->stm32Wr(0xA1,(unsigned char *)m_datatime,8);
 }
 
+void MainInstruction::onRfidCfgBtnClicked()
+{
+    dlgRfidConfig->setAutoConfirmTimeout(sysPara->para.rfidCountDown);
+    dlgRfidConfig->show();
+}
+
+void MainInstruction::onRFIDAutoConfirmTimeoutChanged()
+{
+    sysPara->para.rfidCountDown = dlgRfidConfig->autoConfirmTimeout();
+    qInfo() << "RFID auto confirm timeout: " << sysPara->para.rfidCountDown;
+    sysPara->saveRFIDPara();
+}
+
 void MainInstruction::applyStyleSheet()
 {
     QString styleSheet =