Z991239-4958 #comment feat: 1.初始化文件签名变量 2. 身份证吸入式设备判断

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -578,6 +578,7 @@ ErrorCodeEnum CIDCertFSM::OnInit()
 #endif
 
 	supportUCS2 = FALSE;
+	igestionVer = FALSE;
 
 	return Error_Succeed;
 }
@@ -975,13 +976,16 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 						}
 						else
 						{
-						CSimpleStringA warnMsg = "ScanIDAndSaveImage() suc. But GetPngBlobEx() failed.";
-							if (transImgMsg.GetLength() != 0)
+							if (igestionVer == TRUE)
 							{
-								warnMsg = warnMsg + transImgMsg;
+								CSimpleStringA warnMsg = "ScanIDAndSaveImage() suc. But GetPngBlobEx() failed.";
+								if (transImgMsg.GetLength() != 0)
+								{
+									warnMsg = warnMsg + transImgMsg;
+								}
+								LogWarn(Severity_Middle, Error_Succeed,
+									IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild, warnMsg.GetData());
 							}
-							LogWarn(Severity_Middle, Error_Succeed, 
-								IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild, warnMsg.GetData());
 						}
 					}
 					GetPngBlobEx(ctx->Ans.headphoto, "zp", true);
@@ -1524,13 +1528,16 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 						}
 						else
 						{
-							CSimpleStringA warnMsg = "ScanIDAndSaveImage() suc. But GetPngBlobEx() failed.";
-							if (transImgMsg.GetLength() != 0)
+							if (igestionVer == TRUE)
 							{
-								warnMsg = warnMsg + transImgMsg;
+								CSimpleStringA warnMsg = "ScanIDAndSaveImage() suc. But GetPngBlobEx() failed.";
+								if (transImgMsg.GetLength() != 0)
+								{
+									warnMsg = warnMsg + transImgMsg;
+								}
+								LogWarn(Severity_Middle, Error_Succeed,
+									IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild, warnMsg.GetData());
 							}
-							LogWarn(Severity_Middle, Error_Succeed,
-								IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild, warnMsg.GetData());
 						}
 					}
 					GetPngBlobEx(ctx->Ans.headphoto, "zp", true);
@@ -2128,6 +2135,13 @@ int CIDCertFSM::Initial() //windows ver
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("测试为UCS2新库。");
 			supportUCS2 = TRUE;
 		}
+
+		if (strstr(m_devCatInfo.szModel, "STYLE=IG") != NULL)
+		{
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("吸入式设备");
+			igestionVer = TRUE;
+		}
+
 		m_adapterInfo.FulfillCategoryInfo(m_devCatInfo);
 	}else{
 		SetErrPackage("Initial::GetDevCategory", m_devSN, eErrDev, MEC_DEVAPI_IDCER_GetDevCategory);
@@ -2260,9 +2274,16 @@ int CIDCertFSM::Initial() //linux ver
 		CSimpleStringA szMod(m_devCatInfo.szModel);
 		if (strstr(m_devCatInfo.szModel, "CODE=UCS2") != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("测试为UCS2新库。");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("UCS2新库。");
 			supportUCS2 = TRUE;
 		}
+
+		if (strstr(m_devCatInfo.szModel, "STYLE=IG") != NULL)
+		{
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("吸入式设备");
+			igestionVer = TRUE;
+		}
+
 	}
 	else {
 		SetErrPackage("Initial::GetDevCategory", m_devSN, err, MEC_DEVAPI_IDCER_GetDevCategory);

Module/mod_IDCertificate/IDCertFSM.h

@@ -359,8 +359,9 @@ private:
 #else
 	unordered_map<int, string> nationalCode;
 #endif
-	BOOL supportUCS2;
-	
+	BOOL supportUCS2; //Ö§³ÖÉúƧ×Ö
+	BOOL igestionVer; //ÎüÈëʽÉ豸
+
 	CSimpleStringA m_csAlarmMsg;
 
 	bool invalidBreak;

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -162,6 +162,7 @@ ResourceWatcherFSM::ResourceWatcherFSM(void)
 	m_cpuTop(0)
 {
 #if defined(RVC_OS_WIN)
+    m_iNonSignedTotal = 0;
     m_xIdlePre = 0;
     m_xKernelPre = 0;
     m_xUserPre = 0;