Z991239-6492 #comment feat:修复日志删除不干净导致抛exception；完善数据

DevAdapter/include/CardAssist.cpp

@@ -687,19 +687,19 @@ ErrorCodeEnum CCardProcess::BuildSupportedAppList(CardReadType eType,DeviceBaseC
 					{
 						if (eType == CARD_MACHINE_ISSUER)
 						{
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s", SpStrError(eErr));
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 						}
 						else if (eType == CARD_MACHINE_ISSUER_STORE)
 						{
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s", SpStrError(eErr));
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 						}
 						else if (eType == CARD_MACHINE_ISSUER_RF)
 						{
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s", SpStrError(eErr));
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 						}
 						else if (eType == CARD_MACHINE_ISSUER_STORE_RF)
 						{
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s", SpStrError(eErr));
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 						}
 						else if (eType == CARD_MACHINE_RFIC)
 						{
@@ -754,19 +754,19 @@ ErrorCodeEnum CCardProcess::BuildSupportedAppList(CardReadType eType,DeviceBaseC
 	{
 		if (eType == CARD_MACHINE_ISSUER)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s", SpStrError(eErr));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 		}
 		else if (eType == CARD_MACHINE_ISSUER_STORE)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s", SpStrError(eErr));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::ICCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 		}
 		else if (eType == CARD_MACHINE_ISSUER_RF)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s", SpStrError(eErr));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 		}
 		else if(eType == CARD_MACHINE_ISSUER_STORE_RF)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s", SpStrError(eErr));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList::RFTypeABCommand err=%s, line:%d", SpStrError(eErr), __LINE__);
 		}
 		else if (eType == CARD_MACHINE_RFIC)
 		{
@@ -2620,7 +2620,7 @@ bool CCardProcess::GetICDataFromCard(CardReadType eType,DeviceBaseClass *pCardX,
 
 		if (eErr != Error_Succeed)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("BuildSupportedAppList failed(%d):%s.", eErr);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("BuildSupportedAppList failed:%d, line:%d", eErr, __LINE__);
 			if(eErr == Error_Interact)
 				return false;
 			else

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -4472,7 +4472,7 @@ int CCardIssuerFSM::PreOnlineJS_ReadViaContact(SpReqAnsContext<CardIssuerStandSe
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(m_ullEndTime - m_ullBeginTime)("MoveCard to CI_MOVECARD_IC_POSITION");
 	}
 	else {
-		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, m_ullEndTime - m_ullBeginTime, "QLR040220340");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, !bContinue && IsInBusiness(), m_ullEndTime - m_ullBeginTime);
 		ctx->Ans.icMsg = GetErrMsgByCode(dwTmpUserErrCode);
 		if (bContinue)
 			return -1;
@@ -4579,7 +4579,7 @@ int CCardIssuerFSM::PreOnlineJS_ReadViaRF(SpReqAnsContext<CardIssuerStandService
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(m_ullEndTime - m_ullBeginTime)("PreOnlineJS_RF::MoveCard, (CI_MOVECARD_RF_POSITION)");
 	}
 	else {
-		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, !bContinue && IsInBusiness(), m_ullEndTime - m_ullBeginTime, "QLR040220340");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, !bContinue && IsInBusiness(), m_ullEndTime - m_ullBeginTime);
 		ctx->Ans.icMsg = GetErrMsgByCode(dwTmpUserErrCode);
 		if (bContinue)
 			return -1;