|
@@ -1572,10 +1572,15 @@ int CCardIssuerFSM::Reset()
|
|
|
if (ec == Error_Succeed)
|
|
|
{
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::Reset").setCostTime(l_endTime - l_beginTime)("Reset::Reset");
|
|
|
- if(GetDevStatus())
|
|
|
+
|
|
|
+ l_beginTime = RVCGetTickCount();
|
|
|
+ ec = m_hDevHelper->GetDevStatus(m_devStatus);
|
|
|
+ l_endTime = RVCGetTickCount();
|
|
|
+
|
|
|
+ if( ec == Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("m_issueStatus: %d, m_CardCaptured:%d, m_devStatus.eMedia:%d, in Reset.",
|
|
|
- m_issueStatus, m_CardCaptured, m_devStatus.eMedia);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("Reset::GetDevStatus m_issueStatus: %d, m_CardCaptured:%d, m_devStatus.eMedia:%d",
|
|
|
+ m_issueStatus, m_CardCaptured, m_devStatus.eMedia);
|
|
|
if (m_devStatus.eMedia == CI_MEDIA_PRESENT || m_devStatus.eMedia == CI_MEDIA_ENTERING)
|
|
|
{
|
|
|
ErrorCodeEnum eMoveErr;
|
|
@@ -1610,6 +1615,7 @@ int CCardIssuerFSM::Reset()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ SetErrorAndLog(ec, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime);
|
|
|
return 1;
|
|
|
}
|
|
|
}
|
|
@@ -1945,8 +1951,16 @@ int CCardIssuerFSM::UnAcceptCard()
|
|
|
LOG_FUNCTION();
|
|
|
ErrorCodeEnum eErr;
|
|
|
CSimpleStringA errMsg(true);
|
|
|
- if (GetDevStatus())
|
|
|
+ long l_beginTime, l_endTime;
|
|
|
+
|
|
|
+ l_beginTime = RVCGetTickCount();
|
|
|
+ eErr = m_hDevHelper->GetDevStatus(m_devStatus);
|
|
|
+ l_endTime = RVCGetTickCount();
|
|
|
+
|
|
|
+ if (Error_Succeed == eErr)
|
|
|
{
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("UnAcceptCard::GetDevStatus eMedia: %d", m_devStatus.eMedia);
|
|
|
+
|
|
|
switch (m_devStatus.eMedia)
|
|
|
{
|
|
|
case CI_MEDIA_PRESENT:
|
|
@@ -1980,7 +1994,7 @@ int CCardIssuerFSM::UnAcceptCard()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UnAcceptCard, GetDevStatus failed");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime,"","UnAcceptCard, GetDevStatus failed");
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
@@ -4244,10 +4258,16 @@ int CCardIssuerFSM::QueryCardInfo()
|
|
|
if (m_hDevHelper == nullptr)
|
|
|
ret = 1;
|
|
|
else{
|
|
|
- if(GetDevStatus())
|
|
|
+ long l_beginTime = RVCGetTickCount();
|
|
|
+ ErrorCodeEnum errCode = m_hDevHelper->GetDevStatus(m_devStatus);
|
|
|
+ long l_endTime = RVCGetTickCount();
|
|
|
+ if (Error_Succeed == errCode) {
|
|
|
ret = (m_devStatus.eMedia == CI_MEDIA_PRESENT) ? 2 : 0;
|
|
|
- else
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime);
|
|
|
ret = 1;
|
|
|
+ }
|
|
|
}
|
|
|
DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("QueryCardInfo, ret:%d", ret);
|
|
|
return ret;
|