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

超级IC卡暂存

Browse Source
This commit is contained in:
byons
2026-07-08 16:56:05 +08:00
parent 5b06da56a7
commit 4bb8d7dfa5
21 changed files with 4133 additions and 3811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InkJetPrinter.cpp
+271 -209
View File
@@ -306,7 +306,7 @@ void InkJetPrinter::slt_editCounter(CounterViewModel vm)
void InkJetPrinter::slt_warningMaintenance()
{
// 新逻辑的时间跨度更短，优先判断
// 距离维护时间结束大于30天，判断运行时间的检测
if (timeoutDay >= 30) {
double runHours = sysPara->RFIDPara.runTime / 60.0 / 60.0;
double hours = sysPara->RFIDPara.maintenanceHours - runHours;
@@ -321,11 +321,10 @@ void InkJetPrinter::slt_warningMaintenance()
}
msgtest->setText(str);
msgtest->show();
// m_MainWidget->setRunStatus(str);
LogInfo::setRunStatusText(str);
return;
} else {
warningHandler(3);
warningHandler(CARD_TYPE::MAINTENANCE); // 距离维护时间结束大于30天，判断运行时间的检测
return;
}
@@ -1250,128 +1249,21 @@ void InkJetPrinter::timerHandler(void){
#ifdef __RFID_CARD
// hlp 0513 :甲方要求提示越来越频繁
if(sysPara->status.needMaintenanceRemind){
// if(sysPara->status.needMaintenanceRemind){
// warningHandler(3);
}
static bool logFlagCard1 = 1;
if(!sysPara->para.flagOfInkWarning){
if(sysPara->status.statWarn & WARN_STATUS_INK_WARN)
sysPara->status.inkWarningCnt++;
if(!(sysPara->status.statWarn & WARN_STATUS_INK_WARN))
sysPara->status.inkWarningCnt = 0;
if(sysPara->status.inkWarningCnt >= DETECT_WARNING_TIME){
sysPara->para.flagOfInkWarning = true;
QDateTime curDateTime = QDateTime::currentDateTime();
QString strCurDateTime = curDateTime.toString("yyMMddhhmmss");
LogInfo::setRunStatusText("Ink warning.");
qDebug()<<"墨水液位报警";
if(sysPara->para.inkWarnDate == 0){
sysPara->para.inkWarnDate = strCurDateTime.mid(0,6).toInt();
sysPara->para.inkWarnTime = strCurDateTime.mid(6,6).toInt();
}
sysPara->saveParaToFile();
}
}
else{
if(logFlagCard1){
logFlagCard1 = 0;
QString strDate = QString::number(sysPara->para.inkWarnDate);
QString strTime = QString::number(sysPara->para.inkWarnTime);
QString str1 = QString::number(strDate.mid(0,2).toInt()).rightJustified(2,'0');
QString str2 = QString::number(strDate.mid(2,2).toInt()).rightJustified(2,'0');
QString str3 = QString::number(strDate.mid(4,2).toInt()).rightJustified(2,'0');
QString str4 = QString::number(strTime.mid(0,2).toInt()).rightJustified(2,'0');
QString str5 = QString::number(strTime.mid(2,2).toInt()).rightJustified(2,'0');
QString str6 = QString::number(strTime.mid(4,2).toInt()).rightJustified(2,'0');
QString strDateTime = str1 + "-" + str2 + "-" + str3 + " " + str4 + ":" + str5 + ":" + str6;
LogInfo::setRunStatusText(tr("ink Warning at: %1").arg(strDateTime));
qDebug()<<"ink Warning at:"<<strDateTime;
}
}
static bool logFlag2 = 1;
if(!sysPara->para.flagOfSolventWarning){
if(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN)
sysPara->status.solventWarningCnt++;
if(!(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN))
sysPara->status.solventWarningCnt = 0;
if(sysPara->status.solventWarningCnt >= DETECT_WARNING_TIME){
sysPara->para.flagOfSolventWarning = true;
QDateTime curDateTime = QDateTime::currentDateTime();
QString strCurDateTime = curDateTime.toString("yyMMddhhmmss");
LogInfo::setRunStatusText("Solvent warning.");
qDebug()<<"溶剂液位报警";
if(sysPara->para.solventWarnDate == 0){
sysPara->para.solventWarnDate = strCurDateTime.mid(0,6).toInt();
sysPara->para.solventWarnTime = strCurDateTime.mid(6,6).toInt();
}
sysPara->saveParaToFile();
}
}
else{
if(logFlag2){
logFlag2 = 0;
QString strDate = QString::number(sysPara->para.solventWarnDate);
QString strTime = QString::number(sysPara->para.solventWarnTime);
QString str1 = QString::number(strDate.mid(0,2).toInt()).rightJustified(2,'0');
QString str2 = QString::number(strDate.mid(2,2).toInt()).rightJustified(2,'0');
QString str3 = QString::number(strDate.mid(4,2).toInt()).rightJustified(2,'0');
QString str4 = QString::number(strTime.mid(0,2).toInt()).rightJustified(2,'0');
QString str5 = QString::number(strTime.mid(2,2).toInt()).rightJustified(2,'0');
QString str6 = QString::number(strTime.mid(4,2).toInt()).rightJustified(2,'0');
QString strDateTime = str1 + "-" + str2 + "-" + str3 + " " + str4 + ":" + str5 + ":" + str6;
LogInfo::setRunStatusText(tr("solvent Warning at: %1").arg(strDateTime));
qDebug()<<"solvent Warning at:"<<strDateTime;
}
}
if(sysPara->para.flagOfInkWarning){
if(!sysPara->RFIDPara.needInkCard){
QDateTime curDateTime = QDateTime::currentDateTime();
QByteArray curDateTimestr = curDateTime.toString("yyyy-MM-dd HH::mm::ss").toUtf8();
QFile file("/home/plg/inkRFIDTime.txt");
if(!file.open(QIODevice::WriteOnly)){
qDebug()<<"Open inkRFIDTime Failure.";
LogInfo::setRunStatusText("Open inkRFIDTime Failure.");
}
int ret = file.write(curDateTimestr);
if(ret <= 0){
qDebug()<<"Write inkRFIDTime Failure.";
LogInfo::setRunStatusText("Write inkRFIDTime Failure.");
}
file.close();
sysPara->RFIDPara.needInkCard = true;
sysPara->saveRFIDPara();
}
warningHandler(1);
}
if(sysPara->para.flagOfSolventWarning){
if(!sysPara->RFIDPara.needSolventCard){
QDateTime curDateTime = QDateTime::currentDateTime();
QByteArray curDateTimestr = curDateTime.toString("yyyy-MM-dd HH::mm::ss").toUtf8();
QFile file("/home/plg/solventRFIDTime.txt");
if(!file.open(QIODevice::WriteOnly)){
qDebug()<<"Open solventRFIDTime Failure.";
LogInfo::setRunStatusText("Open solventRFIDTime Failure.");
}
int ret = file.write(curDateTimestr);
if(ret <= 0){
qDebug()<<"Write solventRFIDTime Failure.";
LogInfo::setRunStatusText("Write solventRFIDTime Failure.");
}
file.close();
sysPara->RFIDPara.needSolventCard = true;
sysPara->saveRFIDPara();
}
warningHandler(2);
}
// }
// LogInfo::setRunStatusText(tr("处理警告:%1").arg(QDateTime::currentDateTime()));
handleWarnInk(); // 处理墨水警告
handleWarnSolvent(); // 处理溶剂警告
#endif
static bool resumeFlag = false;
if(lostCommuFlag || m_MainWidget->updatePhaseIndicatorLight() || (sysPara->status.statWarn & (WARN_STATUS_POWER_MON|WARN_STATUS_INK_WARN|WARN_STATUS_SUMP_WARN
|WARN_STATUS_SOLV_WARN|WARN_STATUS_POWER_MON)) || (sysPara->status.gearPumpRunStopFlag && pushButtonStartFlag) ||sysPara->status.lastHighVoltageFault)
if(lostCommuFlag || m_MainWidget->updatePhaseIndicatorLight()
|| (sysPara->status.statWarn &
(WARN_STATUS_POWER_MON|WARN_STATUS_INK_WARN|WARN_STATUS_SUMP_WARN
|WARN_STATUS_SOLV_WARN|WARN_STATUS_POWER_MON))
|| (sysPara->status.gearPumpRunStopFlag && pushButtonStartFlag)
||sysPara->status.lastHighVoltageFault)
{
sysPara->status.beeperOnFlag = true;
if(sysPara->status.gearPumpRunStopFlag && pushButtonStartFlag)
@@ -2756,87 +2648,94 @@ void InkJetPrinter::OnFinished(int event){
}
#define INTERVAL_BEFORE48H 30
#define INTERVAL_AFTER48H 5
void InkJetPrinter::warningHandler(int type){
static int lastMin = 0;
static bool flagOfWarning = true;
static bool flagOfmtWarning = true;
static int lastTimeElasped = 0;
QTime curTime = QTime::currentTime();
QDateTime curDateTime = QDateTime::currentDateTime();
int curMin = curTime.minute();
int timeElasped = 0;
if(lastMin != curMin){
lastMin = curMin;
if(type == 1 && sysPara->RFIDPara.inkCardTimeOut){
if(++sysPara->status.showInkWarningNumber >= INTERVAL_AFTER48H){
warningShow(type,49);
sysPara->status.showInkWarningNumber = 0;
}
return;
}
if(type == 2 && sysPara->RFIDPara.solventCardTimeOut){
if(++sysPara->status.showSolventWarningNumber >= INTERVAL_AFTER48H){
warningShow(type,49);
sysPara->status.showSolventWarningNumber = 0;
}
return;
}
/***********处理保养到期提示start************************/
if(type == 3){
static int i = 1;
if(sysPara->RFIDPara.needMaintenance){//保养到期,喷码机禁用
warningShow(3,timeoutDay);
}
else if(sysPara->status.needMaintenanceRemind){//保养到期提前一个月提示
if(flagOfmtWarning){
warningShow(3,timeoutDay);
flagOfmtWarning = false;
}
QDateTime curDateTime = QDateTime::currentDateTime();
int elasped = curPowerOnDateTime.secsTo(curDateTime);
if(elasped >= 7200*i){
i++;
flagOfmtWarning = true;
}
}
return;
}
/***********处理保养到期提示end**************************************/
timeElasped = dateTimeElasped(type,curDateTime.toString("yyyy-MM-dd HH::mm::ss"));
if(timeElasped - lastTimeElasped >= 60*INTERVAL_BEFORE48H){
qDebug()<<"Next Hour Warning";
LogInfo::setRunStatusText("Next Hour Warning");
flagOfWarning = true;//一个小时提示一次
}
for(int i = 1;i<49;i++){
if(timeElasped <= i*3600 && flagOfWarning){
lastTimeElasped = timeElasped;
warningShow(type,49-i);
flagOfWarning = false;
break;
}
}
if(timeElasped > 48*3600){
if(type == 1){
static bool flagOfmtWarning = true;
static int i = 1;
int elasped = curPowerOnDateTime.secsTo(QDateTime::currentDateTime());// 本次开机运行秒数
if(elasped >= 60*60*i){ //开机后1小时提醒一次,测试时可以缩短
// if (elasped > 30*i) {//test
i++;
flagOfmtWarning = true;
flagOfWarning = true;
LogInfo::setRunStatusText("Next Hour Warning");
}
int inkTime = 0, solventTime = 0;
if (type == CARD_TYPE::INK) {
// 只有当报警标志为true时，文件的时间才会更新，此时才读取
if(sysPara->para.flagOfInkWarning) {
int dateTimeDiff = updateWarningTime(type);
if (dateTimeDiff > 60*60*24*2) {
sysPara->RFIDPara.inkCardTimeOut = true;
warningShow(1,49);
}
if(type == 2){
sysPara->RFIDPara.solventCardTimeOut = true;
warningShow(2,49);
}
sysPara->saveRFIDPara();
if (!sysPara->RFIDPara.inkCardTimeOut)
inkTime = 48- dateTimeDiff/60/60;
}
if(sysPara->RFIDPara.inkCardTimeOut){
if(++sysPara->status.showInkWarningNumber >= INTERVAL_AFTER48H){
warningShow(CARD_TYPE::INK,49);
sysPara->status.showInkWarningNumber = 0;//是否有必要保存?
sysPara->saveRFIDPara();
return;
}
}
sysPara->saveRFIDPara();
}
else if(type == CARD_TYPE::SOLVENT) {
//只有当报警标志为true时，文件的时间才会更新，此时才读取
if (sysPara->para.flagOfSolventWarning) {
int dateTimeDiff = updateWarningTime(type);
if (dateTimeDiff > 60*60*24*2) {
sysPara->RFIDPara.solventCardTimeOut = true;
}
if (!sysPara->RFIDPara.solventCardTimeOut)
solventTime = 48- dateTimeDiff/60/60;
}
if(sysPara->RFIDPara.solventCardTimeOut){
if(++sysPara->status.showSolventWarningNumber >= INTERVAL_AFTER48H){
warningShow(CARD_TYPE::SOLVENT,49);
sysPara->status.showSolventWarningNumber = 0;
sysPara->saveRFIDPara();
return;
}
}
sysPara->saveRFIDPara();
}
/***********处理保养到期提示start******************/
else if(type == CARD_TYPE::MAINTENANCE){
if(sysPara->RFIDPara.needMaintenance){//保养到期,喷码机禁用
warningShow(CARD_TYPE::MAINTENANCE,timeoutDay);
}
//needMaintenanceRemind:保养到期提前一个月提示标志
else if(sysPara->status.needMaintenanceRemind){
if(flagOfmtWarning){
warningShow(CARD_TYPE::MAINTENANCE,timeoutDay);
flagOfmtWarning = false;
}
}
return;
}
/***********处理保养到期提示end******************/
// 超过48小时后，不会执行这一段
if(flagOfWarning){
//48小时后禁用，小时=第一次提示时间到当前时间的间隔秒数/60/60
if (type = INK && sysPara->para.flagOfInkWarning)
warningShow(type,inkTime);
else if (type = SOLVENT && sysPara->para.flagOfSolventWarning)
warningShow(type,solventTime);
flagOfWarning = false;
}
}
// 1:Ink 2:Solvent 3:Maintenance
void InkJetPrinter::warningShow(int type,int num){
QString str = "";
if(type == 1){
if(type == CARD_TYPE::INK && sysPara->RFIDPara.needInkCard){
if(num < 49)
str = tr("请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!").arg(num);
else if(num == 49)
@@ -2847,7 +2746,7 @@ void InkJetPrinter::warningShow(int type,int num){
LogInfo::setRunStatusText(str);
qDebug()<<str;
}
else if(type == 2){
else if(type == CARD_TYPE::SOLVENT && sysPara->RFIDPara.needSolventCard){
if(num < 49)
str = tr("请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!").arg(num);
else if(num == 49)
@@ -2858,14 +2757,13 @@ void InkJetPrinter::warningShow(int type,int num){
LogInfo::setRunStatusText(str);
qDebug()<<str;
}
else if(type == 3){
else if(type == CARD_TYPE::MAINTENANCE){
if(timeoutDay >= 0)
str = tr("保养期还有%1天到期,请及时保养,否则喷码机容易损坏").arg(num);
else
str = tr("保养期已超过%1天,请进行保养以恢复喷码机的正常使用").arg(num*(-1));
msgtest->setText(str);
msgtest->show();
// m_MainWidget->setRunStatus(str);
LogInfo::setRunStatusText(str);
qDebug()<<str;
}
@@ -2893,32 +2791,55 @@ void InkJetPrinter::createNewJobFile()
m_TestPrintWidget->on_newfileButton_pressed();
}
int InkJetPrinter::dateTimeElasped(int type,QString str){
int InkJetPrinter::updateWarningTime(int type){
QFile file;
if(type == 1)
file.setFileName("/home/plg/inkRFIDTime.txt");
else if(type == 2)
file.setFileName("/home/plg/solventRFIDTime.txt");
else return;
if(!file.exists()){
qDebug()<<"刷卡倒计时起始时间文件不存在";
LogInfo::setRunStatusText(tr("刷卡倒计时起始时间文件不存在"));
return -1;
}
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
// 读取文件内容
QTextStream in(&file);
QString starTime = in.readAll();
// 关闭文件
file.close();
QDateTime startDateTime = QDateTime::fromString(starTime,"yyyy-MM-dd HH::mm::ss");
QDateTime curDateTime = QDateTime::fromString(str,"yyyy-MM-dd HH::mm::ss");
int dateTimeDiff = startDateTime.secsTo(curDateTime);
return dateTimeDiff;
} else {
qDebug() << "Failed to open file for reading:";
return -1;
QDateTime curDateTime = QDateTime::currentDateTime();
int dateTimeDiff = -1;
if (type == 1) {
if (inkWarnTime == QDateTime()) {
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
// 读取文件内容
QTextStream in(&file);
QString starTime = in.readAll(); // 第一次提示的时间
// 关闭文件
file.close();
inkWarnTime = QDateTime::fromString(starTime,"yyyy-MM-dd HH::mm::ss");
} else {
qDebug() << "Failed to open file for reading:";
LogInfo::setRunStatusText("Failed to open file for reading");
return -1;
}
}
dateTimeDiff = inkWarnTime.secsTo(curDateTime);
} else if (type == 2) {
if (solventWarnTime == QDateTime()) {
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
// 读取文件内容
QTextStream in(&file);
QString starTime = in.readAll(); // 第一次提示的时间
// 关闭文件
file.close();
solventWarnTime = QDateTime::fromString(starTime,"yyyy-MM-dd HH::mm::ss");
} else {
qDebug() << "Failed to open file for reading:";
LogInfo::setRunStatusText("Failed to open file for reading");
return -1;
}
}
dateTimeDiff = solventWarnTime.secsTo(curDateTime);
}
return dateTimeDiff;
}
bool InkJetPrinter::cardTouchConfirm(QString msgTxt, QString variableMsgTxt)
@@ -2989,6 +2910,147 @@ void InkJetPrinter::initRFIDManager()
m_MainInstruction,SLOT(maintenanceDialogShow()));
}
}
void InkJetPrinter::handleWarnInk()
{
static bool logFlag_inkCard = 1; // 每次启动提示一次即可
if(!sysPara->para.flagOfInkWarning){
if(sysPara->status.statWarn & WARN_STATUS_INK_WARN)
sysPara->status.inkWarningCnt++; // 累计警报10次就提示
else {
sysPara->status.inkWarningCnt = 0;
}
if(sysPara->status.inkWarningCnt >= DETECT_WARNING_TIME){
sysPara->para.flagOfInkWarning = true;
QString strCurDateTime = QDateTime::currentDateTime().toString("yyMMddhhmmss");
LogInfo::setRunStatusText("Ink warning.");
qDebug()<<"墨水液位报警";
if(sysPara->para.inkWarnDate == 0){
sysPara->para.inkWarnDate = strCurDateTime.mid(0,6).toInt();
sysPara->para.inkWarnTime = strCurDateTime.mid(6,6).toInt();
}
sysPara->saveParaToFile();
}
}
else{
if(logFlag_inkCard){
logFlag_inkCard = 0;
QString strDate = QString::number(sysPara->para.inkWarnDate);
QString strTime = QString::number(sysPara->para.inkWarnTime);
QString str1 = QString::number(strDate.mid(0,2).toInt()).rightJustified(2,'0');
QString str2 = QString::number(strDate.mid(2,2).toInt()).rightJustified(2,'0');
QString str3 = QString::number(strDate.mid(4,2).toInt()).rightJustified(2,'0');
QString str4 = QString::number(strTime.mid(0,2).toInt()).rightJustified(2,'0');
QString str5 = QString::number(strTime.mid(2,2).toInt()).rightJustified(2,'0');
QString str6 = QString::number(strTime.mid(4,2).toInt()).rightJustified(2,'0');
QString strDateTime = str1 + "-" + str2 + "-" + str3 + " " + str4 + ":" + str5 + ":" + str6;
LogInfo::setRunStatusText(tr("ink Warning at: %1").arg(strDateTime));
qDebug()<<"ink Warning at:"<<strDateTime;
}
}
if(sysPara->para.flagOfInkWarning){
if(!sysPara->RFIDPara.needInkCard){
// 软件启动后第一次提示的时间
QDateTime curDateTime = QDateTime::currentDateTime();
QByteArray curDateTimestr = curDateTime.toString("yyyy-MM-dd HH::mm::ss").toUtf8();
QFile file("/home/plg/inkRFIDTime.txt");
if(!file.open(QIODevice::WriteOnly)){
qDebug()<<"Open inkRFIDTime Failure.";
LogInfo::setRunStatusText("Open inkRFIDTime Failure.");
}
int ret = file.write(curDateTimestr);
if(ret <= 0){
qDebug()<<"Write inkRFIDTime Failure.";
LogInfo::setRunStatusText("Write inkRFIDTime Failure.");
}
file.close();
sysPara->RFIDPara.needInkCard = true;
sysPara->saveRFIDPara();
}
warningHandler(CARD_TYPE::INK);
// 状态正常但是需要刷卡，说明此时先加的墨水，后面再刷卡
if(!(sysPara->status.statWarn & WARN_STATUS_INK_WARN)
&& sysPara->RFIDPara.needInkCard){
sysPara->RFIDPara.addedInk = true;
sysPara->saveRFIDPara();
}
}
}
void InkJetPrinter::handleWarnSolvent()
{
static bool logFlag_solventCard = 1; // 每次启动提示一次即可
if(!sysPara->para.flagOfSolventWarning){
if(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN)
sysPara->status.solventWarningCnt++;
else{
sysPara->status.solventWarningCnt = 0;
}
if(sysPara->status.solventWarningCnt >= DETECT_WARNING_TIME){
sysPara->para.flagOfSolventWarning = true;
QDateTime curDateTime = QDateTime::currentDateTime();
QString strCurDateTime = curDateTime.toString("yyMMddhhmmss");
LogInfo::setRunStatusText("Solvent warning.");
qDebug()<<"溶剂液位报警";
if(sysPara->para.solventWarnDate == 0){
sysPara->para.solventWarnDate = strCurDateTime.mid(0,6).toInt();
sysPara->para.solventWarnTime = strCurDateTime.mid(6,6).toInt();
}
sysPara->saveParaToFile();
}
}
else{
if(logFlag_solventCard){
logFlag_solventCard = 0;
QString strDate = QString::number(sysPara->para.solventWarnDate);
QString strTime = QString::number(sysPara->para.solventWarnTime);
QString str1 = QString::number(strDate.mid(0,2).toInt()).rightJustified(2,'0');
QString str2 = QString::number(strDate.mid(2,2).toInt()).rightJustified(2,'0');
QString str3 = QString::number(strDate.mid(4,2).toInt()).rightJustified(2,'0');
QString str4 = QString::number(strTime.mid(0,2).toInt()).rightJustified(2,'0');
QString str5 = QString::number(strTime.mid(2,2).toInt()).rightJustified(2,'0');
QString str6 = QString::number(strTime.mid(4,2).toInt()).rightJustified(2,'0');
QString strDateTime = str1 + "-" + str2 + "-" + str3 + " " + str4 + ":" + str5 + ":" + str6;
LogInfo::setRunStatusText(tr("solvent Warning at: %1").arg(strDateTime));
qDebug()<<"solvent Warning at:"<<strDateTime;
}
}
if(sysPara->para.flagOfSolventWarning){
if(!sysPara->RFIDPara.needSolventCard){
QDateTime curDateTime = QDateTime::currentDateTime();
QByteArray curDateTimestr = curDateTime.toString("yyyy-MM-dd HH::mm::ss").toUtf8();
QFile file("/home/plg/solventRFIDTime.txt");
if(!file.open(QIODevice::WriteOnly)){
qDebug()<<"Open solventRFIDTime Failure.";
LogInfo::setRunStatusText("Open solventRFIDTime Failure.");
}
int ret = file.write(curDateTimestr);
if(ret <= 0){
qDebug()<<"Write solventRFIDTime Failure.";
LogInfo::setRunStatusText("Write solventRFIDTime Failure.");
}
file.close();
sysPara->RFIDPara.needSolventCard = true;
sysPara->saveRFIDPara();
}
warningHandler(CARD_TYPE::SOLVENT);
// 如果溶剂报警，说明此时先加的溶剂，后面再刷卡
if(!(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN)
&& sysPara->RFIDPara.needSolventCard){
sysPara->RFIDPara.addedSolvent = true;
sysPara->saveRFIDPara();
}
}
}
#endif
void InkJetPrinter::slt_showMsg(QString msg)
@@ -2996,4 +3058,4 @@ void InkJetPrinter::slt_showMsg(QString msg)
msgtest->setText(msg);
msgtest->show();
LogInfo::setRunStatusText(msg);
}
}