2026-07-03_10_41_VX5 韩国

InkJetPrinter.cpp

@@ -275,9 +275,6 @@ void InkJetPrinter::init()
     connect(m_SystemManage,SIGNAL(upgradeSTM32(QString)),serialSTM32,SLOT(upgradeSTM32File(QString)));
     connect(serialSTM32,SIGNAL(progress(int,int)),m_SystemManage,SLOT(progressBarControl(int,int)));
 
-    /*系统更新*/
-    connect(m_MainInstruction,&MainInstruction::sendButtonClickedSignal,this,&InkJetPrinter::getMainInstructWidgetButtonClickedSlot);
-
     /*系统更新的信号和槽*/
     connect(m_SystemUpdate,&SystemUpdate::sendProgramSTM32Signal,m_SystemManage,&SystemManage::on_pushButtonProgamSTM32_clicked);
     connect(m_SystemUpdate,&SystemUpdate::sendProgramFPGASignal,m_SystemManage,&SystemManage::on_pushButtonProgamFPGA_clicked);

MainInstruction.cpp

@@ -135,6 +135,14 @@ void MainInstruction::ondialogAuthorizationAccepted(){
         sysPara->para.flagOfInkWarning = false;
         sysPara->para.flagOfSolventWarning = false;
         sysPara->status.needMaintenanceRemind = false;
+        sysPara->RFIDPara.inkCardTimeOut = false; 
+        sysPara->RFIDPara.solventCardTimeOut = false;
+        sysPara->RFIDPara.needMaintenance = false;
+        QDate curDate = QDate::currentDate();
+        int curdate = curDate.toString("yyMMdd").toInt();
+        sysPara->RFIDPara.maintenanceDate = curdate;    // 维护日期
+        QDate mtEndDate = curDate.addMonths(sysPara->RFIDPara.maintenanceInterval);
+        sysPara->RFIDPara.maintenanceEndDate = mtEndDate.toString("yyMMdd").toInt();    // 维护结束日期
         sysPara->para.inkWarnDate = 0;
         sysPara->para.inkWarnTime = 0;
         sysPara->para.solventWarnDate = 0;

Printsetting.cpp

@@ -574,10 +574,10 @@ void PrintSetting::on_eleEyeEdgetTriggerInner_clicked()
     }else
         m_model.triggerMode = PRINT_TRIGGER_SYNCHRONIZER;
 
-    setTriggerUI(m_model.triggerMode);
-
     m_model.eleEyeTriggerSynPrintEn = false;
     on_checkEyeTriggerSynPrintEn_clicked(false);
+
+    setTriggerUI(m_model.triggerMode);
 }
 
 void PrintSetting::setEnableEleEyeSetting(bool flag){

Printsetting.ui

@@ -26,7 +26,7 @@
     <enum>Qt::StrongFocus</enum>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>4</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">
@@ -1381,6 +1381,9 @@
      <property name="text">
       <string>开启墨点飞行补偿</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QWidget" name="flightCompPanel" native="true">
      <property name="geometry">
@@ -1419,6 +1422,9 @@
       <property name="maximum">
        <number>999999999</number>
       </property>
+      <property name="value">
+       <number>224000</number>
+      </property>
      </widget>
      <widget class="QCheckBox" name="enbAccelDecelPredict">
       <property name="geometry">
@@ -1432,6 +1438,9 @@
       <property name="text">
        <string>启用加减速预测</string>
       </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
      </widget>
     </widget>
    </widget>

VerBVersion.h

@@ -5,9 +5,9 @@
   Major.Minor.Rivison.yyyy-MM-DD_Beta
 */
 #define UP_PRINTER_MAJOR_VER  6
-#define UP_PRINTER_MINOR_VER  6
+#define UP_PRINTER_MINOR_VER  7
-#define UP_PRINTER_RIVISION_VER  3
+#define UP_PRINTER_RIVISION_VER  1
-#define SUB_VERSION "_beta"
+#define SUB_VERSION "_KOR"
 #ifdef __RFID_OLD
 #define SUB_RFID "_RO"
 #else

rfid/rfidmanager.cpp

@@ -9,7 +9,7 @@
 #include "runtimectrl.h"
 #include "SysPara.h"
 
-//#define HLPDEBUG
+#define HLPDEBUG
 
 
 RFIDManager::RFIDManager()
@@ -123,8 +123,9 @@ void RFIDManager::comForRFID_init()
 #ifndef HLPDEBUG
     comForRFID->setPortName("/dev/ttyAS1");
 #else
-    comForRFID->setPortName("/dev/ttyUSB0");
+    // comForRFID->setPortName("/dev/ttyUSB0");
 #endif
+    comForRFID->setPortName("/dev/ttyAS1");
 
     comForRFID->setBaudRate(9600);
     comForRFID->setDataBits(QSerialPort::Data8);