优化RFID流程逻辑、修改自检流程，关闭循环阀

SysPara.h

@@ -804,8 +804,8 @@ typedef struct {
     bool eleEyeEdgetTriggerExternal;
     bool synTriggerInner;
     bool synTriggerExternal;
-    bool flagOfInkWarning;  //报错累计次数达标，报警标志设为true
-    bool flagOfSolventWarning;  //报错累计次数达标，报警标志设为true
+    bool flagOfInkWarning __attribute_deprecated_msg__("已经由 RFIDPara_t::inInkAndRFIDProgress 替代, 现在已经不使用");  //报错累计次数达标，报警标志设为true
+    bool flagOfSolventWarning __attribute_deprecated_msg__("已经由 RFIDPara_t::inSolventAndRFIDProgress 替代, 现在已经不使用");  //报错累计次数达标，报警标志设为true
     unsigned short rfidCountDown;
     unsigned int canvasHeight;  // 韩国需求中，要求可以设定打印区域的高度，默认为32。
 
@@ -876,31 +876,36 @@ typedef struct
     qint16 full_row_delay_table[48];
     qint16 pixel_general_dac_parameter[64];
 }voltePara_t_No73;
+
 typedef struct
 {
-    unsigned int PrintInkDots;
-    unsigned int InkEmptyCnt;
-    unsigned int SOLVEmptyCnt;
+    unsigned int PrintInkDots __attribute_deprecated_msg__("可能是从 VX5 祖传过来的, 但是现在韩国没有用");
+    unsigned int InkEmptyCnt __attribute_deprecated_msg__("可能是从 VX4 祖传过来的, 但是现在韩国没有用, VX5也没用");
+    unsigned int SOLVEmptyCnt __attribute_deprecated_msg__("可能是从 VX4 祖传过来的, 但是现在韩国没有用, VX5也没用");
     unsigned int InkRFIDCnt;
     unsigned int SOLVRFIDCnt;
-    unsigned short solventNumber;
-    bool needInkCard;
-    bool needSolventCard;
-    bool inkCardTimeOut;
-    bool solventCardTimeOut;
-    unsigned int maintenanceDate;
-    unsigned int maintenanceInterval;
-    unsigned int maintenanceEndDate;
-    bool needMaintenance;
-    // 运行时间与保养间隔时间 runTime>=maintenanceHours 时提示保养
-    unsigned int runTime; // 单位：秒
-    unsigned int maintenanceHours;
+    unsigned short solventNumber __attribute_deprecated_msg__("可能是从 VX5 祖传过来的, 但是现在韩国没有用");
+    bool needInkCard = false;
+    bool needSolventCard = false;
+    bool inkCardTimeOut = false;
+    bool solventCardTimeOut = false;
+    unsigned int maintenanceDate = 0;
+    unsigned int maintenanceInterval = 0;
+    unsigned int maintenanceEndDate = 0;
+    bool needMaintenance = false;
+    // 运行时间与保养间隔时间 runtimeMs>=maintenanceHours 时提示保养
+    unsigned int unused_runTime __attribute_deprecated_msg__("改由 runtimeMs 维护"); // 单位：秒
+    unsigned int maintenanceHours = 0;
     // 已经加过墨水或溶剂
-    bool addedInk;
-    bool addedSolvent;
+    bool addedInk = false;
+    bool addedSolvent = false;
     // 已经刷过墨水或溶剂卡
-    bool cardInk;
-    bool cardSolvent;
+    bool cardInk __attribute_deprecated_msg__("这个字段与 needInkCard 逻辑重复");
+    bool cardSolvent __attribute_deprecated_msg__("这个字段与 needSolventCard 逻辑重复");
+    unsigned int inInkAndRFIDProgress = 0;      
+    unsigned int inSolventAndRFIDProgress = 0;
+    qint64 runtimeMs = 0; // 运行时间，单位毫秒 .这个字段占用的是上面俩弃用字段的空间，兼容VX5的序列化数据
+
 }RFIDPara_t;
 
 #define MDT 0
@@ -1018,7 +1023,8 @@ typedef struct{
     unsigned short flight_tm_error:1;
     unsigned short synPulseCntPer1sH:8;
     unsigned short synPulseCntPer1s:16;
-*/
+    */
+   
     unsigned int ink_dot_num:6;		//飞过相检头上的墨点数		0x20
     unsigned int detect_phase_error:1;
     unsigned int flight_tm_error:1;
@@ -1261,8 +1267,8 @@ typedef struct{
     bool flagOfNeedSolventCard;
     bool flagOfKeyBoardType;
     unsigned char changed;
-    unsigned int inkWarningCnt;
-    unsigned int solventWarningCnt;
+    int inkWarningCnt;
+    int solventWarningCnt;
     unsigned int showInkWarningNumber;
     unsigned int showSolventWarningNumber;
     bool needMaintenanceRemind;