2026年5月23日暂存

DevOp.cpp

@@ -3642,16 +3642,19 @@ void DevOp::comForRFID_init(void)
     comForRFID->setPortName("/dev/ttyUSB0");
 #endif
   
+    LogInfo::setRunStatusText("RFID port dev name: " + comForRFID->portName());
     comForRFID->setBaudRate(9600);
     comForRFID->setDataBits(QSerialPort::Data8);
     comForRFID->setParity(QSerialPort::NoParity);
     comForRFID->setStopBits(QSerialPort::OneStop);
     comForRFID->setFlowControl(QSerialPort::NoFlowControl);
     if (comForRFID->open(QIODevice::ReadWrite)) {
-        qDebug() << "RFID串口打开成功";
+        qInfo() << "RFID串口打开成功";
         connect(comForRFID,SIGNAL(readyRead()),this,SLOT(readRFIDData()));
+        LogInfo::setRunStatusText("Successed to open RFID port");
     } else {
         qDebug() << "RFID串口打开失败: " << comForRFID->errorString();
+        LogInfo::setRunStatusText("Failed to open RFID port");
     }
 
 }
@@ -3710,7 +3713,7 @@ int DevOp::comReadRFID_data()
                 //CardDataRwLock.lockForWrite();
                 strRevdata = QString((const char*)temp);
                // CardDataRwLock.unlock();
-                qDebug() << "读数据块成功，数据块6"  << "数据为：" << temp << endl << endl;
+//                qDebug() << "读数据块成功，数据块6"  << "数据为：" << temp << endl << endl;
                 return 1;
             }
         }
@@ -3807,6 +3810,7 @@ int DevOp::RFIDmarkCardUsedAsync(int type)
         qDebug()<<"Cmd["<<i+6<<"]: "<<Cmd[i+6];
     }
 
+//
     if(type == 0) {
       Cmd[6] = 0x10;
       Cmd[7] = 0x0A;
@@ -3908,7 +3912,7 @@ int DevOp::setRFIDCarKey(void)
     }
     MySleep(200);
     int n = RFIDReadData.size();
-    if(n>0)
+    if(n>2)
     {
         recResponse = RFIDReadData;
         RFIDReadData.clear();
@@ -4015,7 +4019,7 @@ int DevOp::setRFIDReaderKey(int mac,int type)
     }
     QElapsedTimer elapsedTimer;
     elapsedTimer.start();
-    while(comForRFID->bytesAvailable() < 8 && !elapsedTimer.hasExpired(2000)) {
+    while(comForRFID->bytesAvailable() < 8 && !elapsedTimer.hasExpired(20000)) {
       QApplication::processEvents(QEventLoop::AllEvents, 100);
     }
 
@@ -4025,7 +4029,7 @@ int DevOp::setRFIDReaderKey(int mac,int type)
     connect(comForRFID, &QSerialPort::readyRead, this, &DevOp::readRFIDData);
 
     if(n < 8) {
-      qDebug() << "读取数据失败, 数据长度不足8字节" << endl << endl;
+      LogInfo::setRunStatusText(u8"读取数据失败, 数据长度不足8字节");
       return -3;
     }
 
@@ -4088,7 +4092,7 @@ int DevOp::setRFIDReaderOriginalKey(void)
     }
     MySleep(200);
     int n = RFIDReadData.size();
-    if(n>0)
+    if(n>2)
     {
         recResponse = RFIDReadData;
         RFIDReadData.clear();
@@ -4151,7 +4155,7 @@ int DevOp::setRFIDReaderWorkMode(void)
 
     QElapsedTimer elapsedTimer;
     elapsedTimer.start();
-    while(comForRFID->bytesAvailable() < 8 && !elapsedTimer.hasExpired(2000)) {
+    while(comForRFID->bytesAvailable() < 8 && !elapsedTimer.hasExpired(20000)) {
       QApplication::processEvents(QEventLoop::AllEvents, 100);
     }
 
@@ -4161,7 +4165,7 @@ int DevOp::setRFIDReaderWorkMode(void)
     connect(comForRFID, &QSerialPort::readyRead, this, &DevOp::readRFIDData);
 
     if(n < 8) {
-      qDebug() << "读取数据失败, 数据长度不足8字节" << endl << endl;
+      LogInfo::setRunStatusText(u8"读取数据失败, 数据长度不足8字节");
       return -2;
     }
 
@@ -4272,7 +4276,7 @@ int DevOp::queryReadRFID_address(void)
     UCHAR revdata[100] = {0};
     if(n > (int)sizeof(revdata)) n = sizeof(revdata);
     memcpy(revdata, RFIDReadData.constData(),  n);
-    if(n>0)
+    if(n>4)
     {
         showData(RFIDReadData);
         if(CheckSumIn(revdata, revdata[1]) == false){