Z991239-5401 #comment 增加部分硬件接口api字段

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -3191,7 +3191,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER, m_hDevHelper, m_aidList, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3212,7 +3214,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER, m_hDevHelper, preAIDs, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3238,13 +3242,13 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 				{
 					if (m_issueStatus)
 					{
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
 						LogError(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveICCard_Failed, "（IssueCard）PreOnline::DetectAndReadICData:DetectIfICCard");
 						ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveICCard_Failed);
 					}
 					else
 					{
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
 						LogError(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_ActiveICCard_Failed, "PreOnline::DetectAndReadICData:DetectIfICCard");
 						ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_ActiveICCard_Failed);
 					}
@@ -3253,13 +3257,13 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 				{
 					if (m_issueStatus)
 					{
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
 						LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveICCard_Failed, "（IssueCard）PreOnline::DetectAndReadICData:DetectIfICCard");
 						ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveICCard_Failed);
 					}
 					else
 					{
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
 						LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_ActiveICCard_Failed, "PreOnline::DetectAndReadICData:DetectIfICCard");
 						ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_ActiveICCard_Failed);
 					}
@@ -3268,9 +3272,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 			else //非终态，还有非接兜底
 			{
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA230V")("发卡时，检测卡片类型时上电失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA230M")("检测卡片类型时上电失败");
 			}
 		}
 		else if (retDetectAndRead == -2){
@@ -3280,26 +3284,26 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 				if (IsInBusiness())
 				{
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
 					else
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC(true));
 				}
 				else
 				{
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
 					else
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC());
 				}
 			}
 			else //非终态，还有非接兜底
 			{
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
 			}
 		}else if (retDetectAndRead == -3){
 			if (!IfUseRf())
@@ -3309,10 +3313,10 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 				{
 					//TODO 完善日志(LogCode及ResultCode
 					if (m_issueStatus) {
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
 					}
 					else {
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
 					}
 					ctx->Answer(Error_Unexpect, AlarmDEC(true));
 
@@ -3321,10 +3325,10 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 				{
 					//TODO 完善日志(LogCode及ResultCode
 					if (m_issueStatus) {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
 					}
 					else {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
 					}
 					ctx->Answer(Error_Unexpect, AlarmDEC());
 
@@ -3336,9 +3340,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 			{
 				//TODO 完善日志(LogCode及ResultCode
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
 			}
 		}
 		bICOK = false;
@@ -3583,7 +3587,9 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_RF, m_hDevHelper, m_aidList, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3604,7 +3610,9 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_RF, m_hDevHelper, preAIDs, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3627,12 +3635,12 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 			{
 				if (IsInBusiness())
 				{
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2327")("发卡时，检测卡片类型时上电失败（非接）");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2327")("发卡时，检测卡片类型时上电失败（非接）");
 					LogError(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveRF_Failed, "（IssueCard）PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2327")("发卡时，检测卡片类型时上电失败（非接）");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2327")("发卡时，检测卡片类型时上电失败（非接）");
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveRF_Failed, "（IssueCard）PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_IssueCard_ActiveRF_Failed);
@@ -3641,58 +3649,52 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 			{
 				if (IsInBusiness())
 				{
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2326")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2326")("检测卡片类型时上电失败");
 					LogError(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_ActiveContactlessICCard_Failed, "PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2326")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2326")("检测卡片类型时上电失败");
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_ActiveContactlessICCard_Failed, "PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_ActiveContactlessICCard_Failed);
 			}
 		}
 		else if (retDetectAndRead == -2) {
-			//if (m_issueStatus)
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
-			//else
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+
 			SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-2)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
-			//ctx->Answer(Error_Unexpect, AlarmDEC(m_iInWhatPage == PageType_Other));
+			
 			if (IsInBusiness()) {
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
 				else
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
 				ctx->Answer(Error_Unexpect, AlarmDEC(true));
 			}
 			else {
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
 				ctx->Answer(Error_Unexpect, AlarmDEC());
 			}
 		}
 		else if (retDetectAndRead == -3) {
-			//if (m_issueStatus)
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("读取IC数据失败");
-			//else
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("读取IC数据失败");
+
 			SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-3)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
-			//ctx->Answer(Error_Unexpect, AlarmDEC(m_iInWhatPage == PageType_Other));
+			
 			if (IsInBusiness()) {
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
 				else
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
 				ctx->Answer(Error_Unexpect, AlarmDEC(true));
 			}
 			else {
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320").setResultCode("RTA2302")("IC卡建立应用列表失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220303").setResultCode("RTA2302")("IC卡建立应用列表失败");
 				ctx->Answer(Error_Unexpect, AlarmDEC());
 			}
 		}

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -2334,7 +2334,7 @@ int CCardIssuerFSM::CaptureCard(SpReqAnsContext<CardIssuerStoreService_Capture_R
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222004").setResultCode("RTA2W07")("吞卡失败，请检查吞卡箱是否已满或联系厂商检查是否有吞卡");
 				LogWarn(Severity_Middle, Error_Unexpect, 0x22000034, "CaptureCard failed");
 			}
-			//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222004").setResultCode("RTA2W07")("吞卡失败，请检查吞卡箱是否已满或联系厂商检查是否有吞卡");
+			
 			ctx->Answer(Error_Unexpect, 0x22000034);
 		}
 	}
@@ -3424,7 +3424,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_STORE, m_hDevHelper, m_aidList, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3445,7 +3447,9 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_STORE, m_hDevHelper, preAIDs, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3475,22 +3479,21 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 		if (retDetectAndRead == -1){
 			if (m_issueStatus)
 			{
-				//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
 				if (!IfUseRf())
 				{
 					if (m_bCrossPreOnline || m_iInWhatPage == PageType_Other) {
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
 						LogError(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveICCard_Failed, "（IssueCard）PreOnline::DetectAndReadICData:DetectIfICCard");
 					}
 					else {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
 						LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveICCard_Failed, "（IssueCard）PreOnline::DetectAndReadICData:DetectIfICCard");
 					}
 					ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveICCard_Failed);
 				}
 				else {
 					//使用非接兜底
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W0V")("发卡时，检测卡片类型时上电失败");
 				}
 			}
 			else
@@ -3500,84 +3503,78 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 				{
 					if (m_bCrossPreOnline || m_iInWhatPage == PageType_Other)
 					{
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
 						LogError(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed, "PreOnline::DetectAndReadICData:DetectIfICCard");
 					}
 					else
 					{
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
 						LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed, "PreOnline::DetectAndReadICData:DetectIfICCard");
 					}
 					ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed);
 				}
 				else {
 					//使用非接兜底
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W0M")("检测卡片类型时上电失败");
 				}
 			}
 		}
 		else if (retDetectAndRead == -2){
-			//if (m_issueStatus)
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
-			//else
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+			
 			if (!IfUseRf())
 			{
 				SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-2)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
-				//ctx->Answer(Error_Unexpect, AlarmDEC(m_bCrossPreOnline || m_iInWhatPage == PageType_Other));
+				
 				if (IsInBusiness()) {
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
 					else
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC(true));
 				}
 				else {
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
 					else
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC());
 				}
 			}
 			else {
 				//使用非接兜底
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
 			}
 		}
 		else if (retDetectAndRead == -3){
-			//if (m_issueStatus)
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
-			//else
-			//	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+
 			if (!IfUseRf())
 			{
 				SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-3)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
-				//ctx->Answer(Error_Unexpect, AlarmDEC(m_bCrossPreOnline || m_iInWhatPage == PageType_Other));
+				
 				if (IsInBusiness()) {
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 					else
-						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC(true));
 				}
 				else {
 					if (m_issueStatus)
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 					else
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 					ctx->Answer(Error_Unexpect, AlarmDEC());
 				}
 			}
 			else {
 				//使用非接兜底
 				if (m_issueStatus)
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 				else
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ICCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 			}
 
 		}
@@ -3860,7 +3857,9 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_STORE_RF, m_hDevHelper, m_aidList, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3881,7 +3880,9 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 		int icRetryTimes = 0;
 		while (1)
 		{
+			l_beginTime = GetTickCountRVC();
 			retDetectAndRead = m_pCardProcess->DetectAndReadICData(CARD_MACHINE_ISSUER_STORE_RF, m_hDevHelper, preAIDs, activeCardType, m_issueStatus);
+			l_endTime = GetTickCountRVC();
 			if (retDetectAndRead == -1)//only retry for active ic card failed!
 				icRetryTimes++;
 			else
@@ -3909,12 +3910,12 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 			{
 				if (IsInBusiness())
 				{
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W27")("发卡时，检测卡片类型时上电失败（非接）");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W27")("发卡时，检测卡片类型时上电失败（非接）");
 					LogError(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed, "（IssueCard）PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W27")("发卡时，检测卡片类型时上电失败（非接）");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W27")("发卡时，检测卡片类型时上电失败（非接）");
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed, "（IssueCard）PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed);
@@ -3923,12 +3924,12 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 			{
 				if (IsInBusiness())
 				{
-					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W26")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W26")("检测卡片类型时上电失败");
 					LogError(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed, "PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W26")("检测卡片类型时上电失败");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI("DevAdapter::ActiveContactlessICCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W26")("检测卡片类型时上电失败");
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed, "PreOnline_RF::DetectAndReadICData:DetectIfICCard");
 				}
 				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed);
@@ -3936,17 +3937,17 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 		}
 		else if (retDetectAndRead == -2) {
 			if (m_issueStatus)
-				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
+				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("读取IC数据失败");
 			else
-				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
+				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("读取IC数据失败");
 			SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-2)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
 			ctx->Answer(Error_Unexpect, AlarmDEC(true));
 		}
 		else if (retDetectAndRead == -3) {
 			if (m_issueStatus)
-				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 			else
-				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
+				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI("DevAdapter::RFTypeABCommand").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W02")("IC卡建立应用列表失败");
 			SetErrPackage(xCardName + " PreOnline::DetectAndReadICData:GetICDataFromCard(-3)", m_csDevSN, Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand);
 			ctx->Answer(Error_Unexpect, AlarmDEC(true));
 		}