Z991239-6274 #comment feat: 规范日志

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -1464,7 +1464,7 @@ bool CCardIssuerFSM::GetDevStatus(bool bPrint)
 		l_endTime = GetTickCountRVC();
 		
 		if (bPrint)
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetDevStatus, GetDevStatus::eMedia: %d,errCode:%d", m_devStatus.eMedia, errCode);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetDevStatus::GetDevStatus eMedia: %d,errCode:%d", m_devStatus.eMedia, errCode);
 		if (Error_Succeed == errCode) 
 		{
 			if (_strnicmp("RVC.CardPrinter", m_csMachineType, strlen("RVC.CardPrinter")) == 0)
@@ -1673,7 +1673,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 			if (eErrDev == Error_Succeed)
 			{
 				int ret = SplitDevModelInfo();
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(l_endTime - l_beginTime)("DevAdapter::GetDevCategory SplitDevModelInfo=%d",ret);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(l_endTime - l_beginTime)("OpenDevice::GetDevCategory SplitDevModelInfo=%d",ret);
 				m_adapterInfo.FulfillCategoryInfo(m_devCat);
 			}
 			else
@@ -1790,8 +1790,8 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 		spConfigCS->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "SelfcheckSleepTime", tmpSelfcheckSleepTime);
 		spConfigCS->ReadConfigValue("Common", "EacQueryHost", m_EacQueryHost);
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EacQueryFlag:%d,EacQueryHost:%s,UseCardnoMismatch:%d,ICRetryTimes:%d,SelfcheckSleepTime:%d"
-			, m_eacQueryFlag, m_EacQueryHost.GetData(), tmpCardnoMismatch, tmpICRetryTimes, tmpSelfcheckSleepTime);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EacQueryFlag:%d,EacQueryHost:%s,UseCardnoMismatch:%d,ICRetryTimes:%d,SelfcheckSleepTime:%d,StopUseRF:%d"
+			, m_eacQueryFlag, m_EacQueryHost.GetData(), tmpCardnoMismatch, tmpICRetryTimes, tmpSelfcheckSleepTime, tmpStopUseRF);
 
 		if (tmpCardnoMismatch == 1)
 			m_bUseCardnoMismatch = true;
@@ -1831,7 +1831,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 			}
 			else
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("DevAdapter::GetDevStatus device max retain count:%d, cis.eRetainBin:%d", cis.dwRetainCount, cis.eRetainBin);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("OpenDevice::GetDevStatus device max retain count:%d, cis.eRetainBin:%d", cis.dwRetainCount, cis.eRetainBin);
 				if (cis.dwRetainCount > 0 && cis.dwRetainCount <= 5)
 					m_maxRetainCount = cis.dwRetainCount;
 				else
@@ -2658,7 +2658,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 				if (magTracks.track[1].data[i] == 0x3d || magTracks.track[1].data[i] == 0x3e || magTracks.track[1].data[i] == 0x44)// fixpoint (3d是=，3e是 >), 运通卡要考虑分隔符为D的情况
 					break;
 			}
-			
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleString::Format("<ReadCard::MagRead>, split pos:%d", pos));
 			if (pos <= 0 || pos == magTracks.track[1].dwSize)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<ReadCard::MagRead>, split track is err, pos:%d", pos);
@@ -2932,7 +2932,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
 				if (magTracks.track[1].data[i] == 0x3d || magTracks.track[1].data[i] == 0x3e || magTracks.track[1].data[i] == 0x44)// fixpoint (3d是=，3e是 >), 运通卡要考虑分隔符为D的情况
 					break;
 			}
-			
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleString::Format("<ReadCard::MagRead>, split pos:%d", pos));
 			if (pos <= 0 || pos == magTracks.track[1].dwSize)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<ReadCard::MagRead>, split track is err, pos:%d", pos);
@@ -3160,7 +3160,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 		if (pAIDTmp != NULL)
 			delete[]pAIDTmp;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnline>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnline>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
 	if (retDetectAndRead < 0)
 	{
 		CSimpleStringA xCardName("");
@@ -3550,7 +3550,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 		if (pAIDTmp != NULL)
 			delete[]pAIDTmp;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnline_RF>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnline_RF>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
 	if (retDetectAndRead < 0)
 	{
 		CSimpleStringA xCardName("");
@@ -4247,7 +4247,7 @@ int CCardIssuerFSM::QueryCardInfo()
 		else
 			ret = 1;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("QueryCardInfo, ret:%d", ret);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("QueryCardInfo, ret:%d", ret);
 	return ret;
 }
 
@@ -4289,14 +4289,7 @@ int CCardIssuerFSM::UpdateLocalRunCfg(CAutoArray<int> hopperArr)
 			spConfig->WriteConfigValueInt(sec, "CardPercent", m_CardPercentEx[i]);
 			spConfig->WriteConfigValue(sec, "Maintainer", m_MaintainerEx[i]);
 			spConfig->WriteConfigValue(sec, "MaintainTime", m_csMaintainTimeEx[i]);
-			//if (i == 0 && hopperArr[0] == 1)
-			//{
-			//	spConfig->WriteConfigValueInt("RunInfo", "CardInit", m_CardInitEx[i]);
-			//	spConfig->WriteConfigValueInt("RunInfo", "CardRemains", m_remainsEx[i]);
-			//	spConfig->WriteConfigValueInt("RunInfo", "CardIssued", m_issuedEx[i]);
-			//	spConfig->WriteConfigValueInt("RunInfo", "CardMixed", m_mixedEx[i]);
-			//	spConfig->WriteConfigValueInt("RunInfo", "CardPercent", m_CardPercentEx[i]);
-			//}
+
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UpdateLocalRunCfg, sec:%s,CardBoxNo:%s,CardInit:%d,CardRemains:%d,CardIssued:%d",
 				sec, m_CardBoxNoEx[i].GetData(), m_CardInitEx[i], m_remainsEx[i], m_issuedEx[i]);
 		}
@@ -6013,7 +6006,7 @@ int CCardIssuerFSM::ReadMag(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, C
 				if (magTracks.track[1].data[i] == 0x3d || magTracks.track[1].data[i] == 0x3e || magTracks.track[1].data[i] == 0x44)// fixpoint (3d是=，3e是 >), 运通卡要考虑分隔符为D的情况
 					break;
 			}
-
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleString::Format("<ReadMag::MagRead>, split pos:%d", pos));
 			if (pos <= 0 || pos == magTracks.track[1].dwSize)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<ReadMag::MagRead>, split track is err, pos:%d", pos);
@@ -6322,7 +6315,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
 			delete[]pAIDTmp;
 	}
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
 
 	if (retDetectAndRead < 0)
 	{
@@ -6724,7 +6717,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
 			delete[]pAIDTmp;
 	}
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
 
 	if (retDetectAndRead < 0)
 	{