hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026年6月22日 :大量更新

Browse Source
This commit is contained in:
byons
2026-06-22 08:51:10 +08:00
parent be39714c5e
commit 0fb69c2897
75 changed files with 1518 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rfid/rfidmanager.cpp
+32 -30
View File
@@ -7,6 +7,7 @@
#include <QDebug>
#include <QMessageBox>
#include "runtimectrl.h"
#include "SysPara.h"
//#define HLPDEBUG
@@ -348,8 +349,9 @@ int RFIDManager::RFIDmarkCardUsedAsync(int type)
}
void RFIDManager::initRFIDMoudle(unsigned int addr)
void RFIDManager::initRFIDMoudle(unsigned int addr, SysPara *sysPara)
{
this->sysPara = sysPara;
setICReaderModeFlag = true;
setRFIDReaderWorkMode();
setRFIDReaderKey(addr,1);
@@ -368,10 +370,10 @@ void RFIDManager::handleCheck(unsigned int addr)
|| strRevdata.left(3) == "100")
{
if(strRevdata.at(3) == 'A') {
if(!SysPara::ins()->RFIDPara.needInkCard && false){
if(!sysPara->RFIDPara.needInkCard && false){
emit sig_showMsg(tr("不需要刷墨水卡!"));
}
else if(SysPara::ins()->status.statWarn & WARN_STATUS_INK_WARN && false){
else if(sysPara->status.statWarn & WARN_STATUS_INK_WARN && false){
emit sig_showMsg(tr("请先添加墨水再刷墨水卡!"));
}
else
@@ -381,24 +383,24 @@ void RFIDManager::handleCheck(unsigned int addr)
LogInfo::setRunStatusText("The user has canceled the operation about marking the ink card.");
}
else if(RFIDmarkCardUsedAsync(0) == 1){
SysPara::ins()->RFIDPara.needInkCard = false;
SysPara::ins()->RFIDPara.inkCardTimeOut = false;
SysPara::ins()->saveRFIDPara();
sysPara->RFIDPara.needInkCard = false;
sysPara->RFIDPara.inkCardTimeOut = false;
sysPara->saveRFIDPara();
emit sig_showMsg(tr("刷墨水卡成功!"));
SysPara::ins()->para.inkWarnDate = 0;
SysPara::ins()->para.inkWarnTime = 0;
SysPara::ins()->saveParaToFile();
sysPara->para.inkWarnDate = 0;
sysPara->para.inkWarnTime = 0;
sysPara->saveParaToFile();
}
}
}
else if(strRevdata.at(3) == 'B')
{
SysPara::ins()->para.flagOfInkWarning = false;
sysPara->para.flagOfInkWarning = false;
if(!SysPara::ins()->RFIDPara.needSolventCard && false){
if(!sysPara->RFIDPara.needSolventCard && false){
emit sig_showMsg(tr("不需要刷溶剂卡!"));
}
else if(SysPara::ins()->status.statWarn & WARN_STATUS_SOLV_WARN && false){
else if(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN && false){
emit sig_showMsg(tr("请先添加溶剂再刷溶剂卡!"));
}
else
@@ -408,14 +410,14 @@ void RFIDManager::handleCheck(unsigned int addr)
LogInfo::setRunStatusText("The user has canceled the operation about marking the solvent card.");
}
else if(RFIDmarkCardUsedAsync(1) == 1) {
SysPara::ins()->RFIDPara.needSolventCard = false;
SysPara::ins()->RFIDPara.solventCardTimeOut = false;
SysPara::ins()->saveRFIDPara();
sysPara->RFIDPara.needSolventCard = false;
sysPara->RFIDPara.solventCardTimeOut = false;
sysPara->saveRFIDPara();
emit sig_showMsg(tr("刷溶剂卡成功!"));
SysPara::ins()->para.flagOfSolventWarning = false;
SysPara::ins()->para.solventWarnDate = 0;
SysPara::ins()->para.solventWarnTime = 0;
SysPara::ins()->saveParaToFile();
sysPara->para.flagOfSolventWarning = false;
sysPara->para.solventWarnDate = 0;
sysPara->para.solventWarnTime = 0;
sysPara->saveParaToFile();
}
}
@@ -429,16 +431,16 @@ void RFIDManager::handleCheck(unsigned int addr)
emit sig_maintenanceShow();
SysPara::ins()->RFIDPara.needMaintenance = false;
SysPara::ins()->status.needMaintenanceRemind = false;
sysPara->RFIDPara.needMaintenance = false;
sysPara->status.needMaintenanceRemind = false;
QDate curDate = QDate::currentDate();
SysPara::ins()->RFIDPara.maintenanceDate = curDate.toString("yyMMdd").toInt();
QDate mtEndDate = curDate.addMonths(SysPara::ins()->RFIDPara.maintenanceInterval);
SysPara::ins()->RFIDPara.maintenanceEndDate = mtEndDate.toString("yyMMdd").toInt();
SysPara::ins()->RFIDPara.runTime = 0;
RunTimeCtrl::instance()->updatePara(&SysPara::ins()->RFIDPara);
SysPara::ins()->saveRFIDPara();
sysPara->RFIDPara.maintenanceDate = curDate.toString("yyMMdd").toInt();
QDate mtEndDate = curDate.addMonths(sysPara->RFIDPara.maintenanceInterval);
sysPara->RFIDPara.maintenanceEndDate = mtEndDate.toString("yyMMdd").toInt();
sysPara->RFIDPara.runTime = 0;
RunTimeCtrl::instance()->updatePara(&sysPara->RFIDPara);
sysPara->saveRFIDPara();
emit sig_showMsg(tr("刷保养卡成功!"));
}
else {
@@ -898,7 +900,7 @@ bool RFIDManager::cardTouchConfirm(QString msgTxt, QString variableMsgTxt)
QMessageBox box(QMessageBox::Warning, tr("警告"),
msgTxt, QMessageBox::Ok | QMessageBox::Cancel);
int rfidCountDown = SysPara::ins()->para.rfidCountDown;
int rfidCountDown = sysPara->para.rfidCountDown;
QTimer msgTimer;
QString boxTxt = variableMsgTxt;
connect(&msgTimer, &QTimer::timeout, [this, &box, &rfidCountDown, boxTxt]() {
@@ -910,8 +912,8 @@ bool RFIDManager::cardTouchConfirm(QString msgTxt, QString variableMsgTxt)
}
});
if(SysPara::ins()->para.rfidCountDown > 0) {
box.setText(boxTxt.arg(SysPara::ins()->para.rfidCountDown));
if(sysPara->para.rfidCountDown > 0) {
box.setText(boxTxt.arg(sysPara->para.rfidCountDown));
msgTimer.start(1000);
}
rfid/rfidmanager.h
+4 -1
View File
@@ -7,6 +7,8 @@
#include <QTimer>
#include <QMutex>
class SysPara;
typedef unsigned char UCHAR;
class RFIDManager : public QObject
{
@@ -23,7 +25,7 @@ public:
// InkJetPrinter定时器timerHandler触发，检查刷卡状态
// 初始化刷卡模块
void initRFIDMoudle(unsigned int addr);
void initRFIDMoudle(unsigned int addr, SysPara *sysPara);
// 300ms检查处理
void handleCheck(unsigned int addr);
@@ -58,6 +60,7 @@ private:
QString strRevdata;
bool setICReaderModeFlag;
uint checkCardIntervalTime;
SysPara* sysPara = nullptr;
QTimer* RFIDTimer = nullptr;
void initTimer();