|
@@ -2350,7 +2350,6 @@ int CCardProcess::SplitOnlineReplyData(const char *pData,int size)
|
|
|
int CCardProcess::DetectAndReadICData(CardReadType eType, DeviceBaseClass *pCardX, CAutoArray<CSimpleStringA>pAIDs, int &cardType, bool bIssue)
|
|
|
{
|
|
|
LOG_FUNCTION();
|
|
|
- long l_beginTime, l_endTime;
|
|
|
bool bIC = DetectIfICCard(eType,pCardX,cardType,bIssue);
|
|
|
if (!bIC)
|
|
|
{
|
|
@@ -2358,35 +2357,7 @@ int CCardProcess::DetectAndReadICData(CardReadType eType, DeviceBaseClass *pCard
|
|
|
return -1;
|
|
|
}
|
|
|
int bGetICData = -3;
|
|
|
-
|
|
|
- l_beginTime = GetTickCount();
|
|
|
bGetICData = GetICDataFromCard(eType,pCardX,pAIDs);
|
|
|
- l_endTime = GetTickCount();
|
|
|
-
|
|
|
- if (eType == CARD_MACHINE_ISSUER || eType == CARD_MACHINE_ISSUER_STORE) {
|
|
|
- if (bGetICData == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard");
|
|
|
- }
|
|
|
- else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard error");
|
|
|
- }
|
|
|
- }
|
|
|
- if (eType == CARD_MACHINE_ISSUER_RF || eType == CARD_MACHINE_ISSUER_STORE_RF){
|
|
|
- if (bGetICData == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard_RF").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard");
|
|
|
- }
|
|
|
- else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard_RF").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard error");
|
|
|
- }
|
|
|
- }
|
|
|
- else if (eType == CARD_MACHINE_RFIC){
|
|
|
- if (bGetICData == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard_RFIC").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard");
|
|
|
- }
|
|
|
- else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetICDataFromCard_RFIC").setCostTime(l_endTime - l_beginTime)("DetectAndReadICData::GetICDataFromCard error");
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
if (bGetICData != 0)
|
|
|
{
|
|
@@ -2394,7 +2365,6 @@ int CCardProcess::DetectAndReadICData(CardReadType eType, DeviceBaseClass *pCard
|
|
|
DbgWarn(errMsg.GetData());
|
|
|
return bGetICData;
|
|
|
}
|
|
|
-
|
|
|
GetBaseInfoNotInRecord(eType,pCardX);
|
|
|
|
|
|
return 0;
|