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

2026年5月23日暂存

Browse Source
This commit is contained in:
byons
2026-05-23 14:16:57 +08:00
parent c8a5a121c9
commit 1cb9d5ac42
59 changed files with 15774 additions and 8662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainInstruction.cpp
+40 -52
View File
@@ -3,6 +3,7 @@
#include <QMessageBox>
#include <QDebug>
#include "DlgRFIDConfig.h"
#include "runtimectrl.h"
MainInstruction::MainInstruction(QWidget *parent) :
QWidget(parent),
@@ -38,9 +39,21 @@ MainInstruction::MainInstruction(QWidget *parent) :
MTimeSetting = new DialogMaintenanceTimeSetting(this);
connect(MTimeSetting,SIGNAL(accepted()),this,SLOT(onMTimeSettingAccepted()));
//30s刷新一次总运行时间
connect(RunTimeCtrl::instance(), &RunTimeCtrl::sig_saveRunTime
, this, [=]() {
if (sysPara)
MTimeSetting->updateUI(sysPara->RFIDPara);
});
applyStyleSheet();
// 授权
ui->tabWidget->removeTab(2);
timeDia.hide();
connect(&timeDia,SIGNAL(accepted()),this,SLOT(slt_timeSetting()));
}
MainInstruction::~MainInstruction()
@@ -82,51 +95,24 @@ void MainInstruction::on_maintenanceIntervalBtn_clicked()
}
void MainInstruction::onDlgAuthMaintenanceTimeAccepted(){
// QString authString= dialogMaintenanceTimeSettingAuth->getAuth();
// if(dlgInputAddr->checWhJmDate(authString)) // 0xa001
// {
QDate curDate = QDate::currentDate();
QString mtEndDatestr = "20" + QString::number(sysPara->RFIDPara.maintenanceEndDate);
QDate mtEndDate = QDate::fromString(mtEndDatestr,"yyyyMMdd");
int timeoutDay = curDate.daysTo(mtEndDate);
MTimeSetting->updateMaintenanceTime(QString("%1 Days").arg(timeoutDay));
MTimeSetting->updateMaintenanceIntervalToUI(sysPara->RFIDPara.maintenanceInterval);
void MainInstruction::onDlgAuthMaintenanceTimeAccepted()
{
MTimeSetting->updateUI(sysPara->RFIDPara);
MTimeSetting->disableMaintenanceTimeSet(false);
MTimeSetting->show();
// }else
// {
// QMessageBox::about(this, tr("提示"), tr("密码不正确！"));
// return;
// }
}
void MainInstruction::maintenanceDialogShow(){
QDate curDate = QDate::currentDate();
QString mtEndDatestr = "20" + QString::number(sysPara->RFIDPara.maintenanceEndDate);
QDate mtEndDate = QDate::fromString(mtEndDatestr,"yyyyMMdd");
int timeoutDay = curDate.daysTo(mtEndDate);
MTimeSetting->updateMaintenanceTime(QString("%1 Days").arg(timeoutDay));
MTimeSetting->updateMaintenanceIntervalToUI(sysPara->RFIDPara.maintenanceInterval);
void MainInstruction::maintenanceDialogShow()
{
MTimeSetting->updateUI(sysPara->RFIDPara);
RunTimeCtrl::instance()->updatePara(&sysPara->RFIDPara);
MTimeSetting->disableMaintenanceTimeSet(true);
MTimeSetting->show();
}
void MainInstruction::onMTimeSettingAccepted(){
sysPara->RFIDPara.maintenanceInterval = MTimeSetting->getInterval();
if(MTimeSetting->getResetSchedule()){
QDate curDate = QDate::currentDate();
int curdate = curDate.toString("yyMMdd").toInt();
sysPara->RFIDPara.maintenanceDate = curdate;
}
QString mtDatestr = QString::number(sysPara->RFIDPara.maintenanceDate);
QDate mtDate = QDate::fromString(mtDatestr,"yyMMdd");
QDate mtEndDate = mtDate.addMonths(sysPara->RFIDPara.maintenanceInterval);
sysPara->RFIDPara.maintenanceEndDate = mtEndDate.toString("yyMMdd").toInt();
LogInfo::setRunStatusText(tr("mtDate1: %1").arg(sysPara->RFIDPara.maintenanceDate));
LogInfo::setRunStatusText(tr("mtInterval1: %1").arg(sysPara->RFIDPara.maintenanceInterval));
LogInfo::setRunStatusText(tr("mtEndDate1: %1").arg(sysPara->RFIDPara.maintenanceEndDate));
LogInfo::setRunStatusText(tr("mtFlog1: %1").arg(sysPara->RFIDPara.needMaintenance));
MTimeSetting->getInterval(&sysPara->RFIDPara);
RunTimeCtrl::instance()->updatePara(&sysPara->RFIDPara);
sysPara->saveRFIDPara();
}
@@ -137,22 +123,12 @@ void MainInstruction::ondialogAuthorizationAccepted(){
if((authString.left(4) == "nnyp") && ( dlgInputAddr->checkSupperJm(authString.mid(4))))
{
#ifdef __RFID_CARD
/**********超级密码，除了维护时间的3个参数，其他参数清零*****************/
unsigned int mtDate = sysPara->RFIDPara.maintenanceDate;
unsigned int mtInterval = sysPara->RFIDPara.maintenanceInterval;
unsigned int mtEndDate = sysPara->RFIDPara.maintenanceEndDate;
qDebug()<<"mtDate2: "<<sysPara->RFIDPara.maintenanceDate;
qDebug()<<"mtInterval2: "<<sysPara->RFIDPara.maintenanceInterval;
qDebug()<<"mtEndDate2: "<<sysPara->RFIDPara.maintenanceEndDate;
/**********超级密码，除了维护时间的5个参数，其他参数清零*****************/
memset(&sysPara->RFIDPara,0,sizeof(sysPara->RFIDPara));
sysPara->RFIDPara.maintenanceDate = mtDate;
sysPara->RFIDPara.maintenanceInterval = mtInterval;
sysPara->RFIDPara.maintenanceEndDate = mtEndDate;
qDebug()<<"mtDate3: "<<sysPara->RFIDPara.maintenanceDate;
qDebug()<<"mtInterval3: "<<sysPara->RFIDPara.maintenanceInterval;
qDebug()<<"mtEndDate3: "<<sysPara->RFIDPara.maintenanceEndDate;
RunTimeCtrl::instance()->authorizationAccepted(&sysPara->RFIDPara);
sysPara->saveRFIDPara();
QMessageBox::warning(0,tr("提示"),tr("RFID卡清零!") );
sysPara->para.flagOfInkWarning = false;
sysPara->para.flagOfSolventWarning = false;
sysPara->status.needMaintenanceRemind = false;
@@ -170,11 +146,25 @@ void MainInstruction::ondialogAuthorizationAccepted(){
dlgInputAddr->show();
// ui->labMac->setText(QString("Mac:%1").arg(dlgInputAddr->jd.addr));
}
else if(authString == "nnyp") {
ui->tabWidget->addTab(ui->tabExtra, tr("额外设置"));
ui->pushButtonAuth->setText(tr("取消授权"));
} else {
QMessageBox box(QMessageBox::Warning, tr("警告"),
tr("密码错误:%1").arg(authString), QMessageBox::Ok,
this);
box.exec();
}
}
void MainInstruction::on_pushButtonAuth_clicked()
{
if (ui->pushButtonAuth->text() == tr("取消授权")) {
ui->pushButtonAuth->setText(tr("系统授权"));
int index = ui->tabWidget->indexOf(ui->tabExtra);
ui->tabWidget->removeTab(index);
return;
}
dialogAuthorization->clearAuth();
dialogAuthorization->show();
}
@@ -190,9 +180,7 @@ void MainInstruction::on_btn_time_clicked()
timeDia.setHour(tm.hour());
timeDia.setMinute(tm.minute());
timeDia.setSecond(tm.second());
timeDia.hide();
timeDia.show();
connect(&timeDia,SIGNAL(accepted()),this,SLOT(slt_timeSetting()));
}
#include <time.h>