Эх сурвалжийг харах

#IQRV #comment [BugFix] 日志优化

gifur 2 жил өмнө
parent
commit
d4365369da

+ 4 - 4
DevAdapter/include/CardAssist.cpp

@@ -415,7 +415,7 @@ bool CCardProcess::DetectIfICCard(CardReadType eType, DeviceBaseClass *pCardX, i
 		if (eErr != Error_Succeed)
 		{
 			QueryLastErr(pCardR, errMsg);
-			errMsg = CSimpleStringA::Format("DetectIfICCard::ActiveContactlessICCard failed(%d):%s", eErr, errMsg.GetData());
+			errMsg = CSimpleStringA::Format("DetectIfICCard::ActiveContactlessICCard failed(%s):%s", SpStrError(eErr), errMsg.GetData());
 			LogWarn(Severity_Middle, Error_Unexpect, ContactlessCard_UserErrorCode_ActiveContactlessICCard_Failed, errMsg.GetData());
 			return false;
 		}
@@ -623,7 +623,7 @@ ErrorCodeEnum CCardProcess::BuildSupportedAppList(CardReadType eType,DeviceBaseC
 					else
 					{
 						QueryLastErr(pCardX, errMsg);
-						errMsg = CSimpleStringA::Format("BuildSupportedAppList::ICCommand 2 failed(%d):%s", eErr, errMsg.GetData());
+						errMsg = CSimpleStringA::Format("BuildSupportedAppList::ICCommand 2 failed(%s):%s", SpStrError(eErr), errMsg.GetData());
 						LogWarn(Severity_Middle, Error_Unexpect, errICCommand, errMsg.GetData());
 						break;
 					}
@@ -2391,7 +2391,7 @@ bool CCardProcess::GetICDataFromCard(CardReadType eType, DeviceBaseClass* pCardX
 		if (eErr != Error_Succeed)
 		{
 			QueryLastErr(pCardX, errMsg);
-			errMsg = CSimpleStringA::Format("GetICDataFromCard::BuildSupportedAppList failed(%d):%s.", eErr, errMsg.GetData());
+			errMsg = CSimpleStringA::Format("GetICDataFromCard::BuildSupportedAppList failed(%s):%s.", SpStrError(eErr), errMsg.GetData());
 			LogWarn(Severity_Middle, Error_Unexpect, errBuildAppList, errMsg.GetData());
 			continue;
 		}
@@ -2411,7 +2411,7 @@ bool CCardProcess::GetICDataFromCard(CardReadType eType, DeviceBaseClass* pCardX
 		else
 		{
 			QueryLastErr(pCardX, errMsg);
-			errMsg = CSimpleStringA::Format("GetICDataFromCard::AppSelected failed(%d):%s.", eErr, errMsg.GetData());
+			errMsg = CSimpleStringA::Format("GetICDataFromCard::AppSelected failed(%s):%s.", SpStrError(eErr), errMsg.GetData());
 			LogWarn(Severity_Middle, Error_Unexpect, errBuildAppList, errMsg.GetData());
 			continue;
 		}

+ 1 - 1
Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -2871,7 +2871,7 @@ int CCardIssuerFSM::EjectCard(SpReqAnsContext<CardIssuerService_Eject_Req,CardIs
                       , m_csDevSN, eErr, MEC_DEVAPI_CARDISSUER_MoveCard);
 		if (ctx != NULL) {
             LogError(Severity_High, Error_Unexpect, CardIssuer_UserErrorCode_EjectCard_Failed, "EjectCard failed.");
-			ctx->Answer(eErr, AlarmDEC(m_errPkg, true, false));
+			ctx->Answer(eErr, AlarmDEC(m_errPkg));
 		} else {
 			AlarmDEC(m_errPkg);
 		}