Z991239-5799 #comment feat: 优化卡集告警码

Signed-Off-By: commit-hook

DevAdapter/include/CardAssist.cpp

@@ -754,10 +754,10 @@ ErrorCodeEnum CCardProcess::BuildSupportedAppList(CardReadType eType,DeviceBaseC
 				errICCommand = CardIssuerStore_UserErrorCode_ICCommand_RecvData_Invalid;
 				break;
 			case CARD_MACHINE_ISSUER_RF:
-				errICCommand = ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid;
+				errICCommand = CardIssuer_UserErrorCode_ICCommand_RF_RecvData_Invalid;
 				break;
 			case CARD_MACHINE_ISSUER_STORE_RF:
-				errICCommand = ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid;
+				errICCommand = CardIssuerStore_UserErrorCode_ICCommand_RF_RecvData_Invalid;
 				break;
 			case CARD_MACHINE_RFIC:
 				errICCommand = ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid;
@@ -2699,10 +2699,15 @@ int CCardProcess::GetICDataFromCard(CardReadType eType,DeviceBaseClass *pCardX,
 			pCardI = dynamic_cast<CardIssuerClass*>(pCardX);
 			errBuildAppList = CardIssuerStore_UserErrorCode_BuildSupportedAppList_Failed;
 		}
-		else if (eType == CARD_MACHINE_ISSUER_RF || eType == CARD_MACHINE_ISSUER_STORE_RF)
+		else if (eType == CARD_MACHINE_ISSUER_RF)
 		{
 			pCardI = dynamic_cast<CardIssuerClass*>(pCardX);
-			errBuildAppList = ContactlessCard_UserErrorCode_BuildSupportedAppList_Failed;
+			errBuildAppList = CardIssuer_UserErrorCode_BuildSupportedAppList_Failed;
+		}
+		else if (eType == CARD_MACHINE_ISSUER_STORE_RF)
+		{
+			pCardI = dynamic_cast<CardIssuerClass*>(pCardX);
+			errBuildAppList = CardIssuerStore_UserErrorCode_BuildSupportedAppList_Failed;
 		}
 		else if (eType == CARD_MACHINE_RFIC)
 		{

Module/mod_CardIssuerStand/CardIssuer_UserErrorCode.h

@@ -156,6 +156,7 @@
 #define CardIssuer_UserErrorCode_ICCommand_RecvData_Invalid			(CardIssuer_UserErrorCode_Start + 121)	//APDU接收到的数据无效
 #define CardIssuer_UserErrorCode_ActiveContactlessICCard_Failed		(CardIssuer_UserErrorCode_Start + 122)	//激活非接失败
 #define CardIssuer_UserErrorCode_IssueCard_ActiveRF_Failed			(CardIssuer_UserErrorCode_Start + 123)	//发卡时，激活非接失败
+#define CardIssuer_UserErrorCode_ICCommand_RF_RecvData_Invalid			(CardIssuer_UserErrorCode_Start + 124)	//APDU接收到的非接数据无效
 //
 #define CardIssuer_UserErrorCode_Open_Success						(CardIssuer_UserErrorCode_Start + 141)	//读卡器最终打开成功
 #define CardIssuer_UserErrorCode_Open_Failed						(CardIssuer_UserErrorCode_Start + 142)	//读卡器最终打开失败

Module/mod_cardissuerstore/CardIssuerStore_UserErrorCode.h

@@ -156,6 +156,7 @@
 #define CardIssuerStore_UserErrorCode_ICCommand_RecvData_Invalid			(CardIssuerStore_UserErrorCode_Start + 121)	//APDU接收到的数据无效
 #define CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed		(CardIssuerStore_UserErrorCode_Start + 122)	//激活非接失败
 #define CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed			(CardIssuerStore_UserErrorCode_Start + 123)	//发卡时，激活非接失败
+#define CardIssuerStore_UserErrorCode_ICCommand_RF_RecvData_Invalid			(CardIssuerStore_UserErrorCode_Start + 124)	//APDU接收到的非接数据无效
 //
 #define CardIssuerStore_UserErrorCode_Open_Success						(CardIssuerStore_UserErrorCode_Start + 141)	//读卡器最终打开成功
 #define CardIssuerStore_UserErrorCode_Open_Failed						(CardIssuerStore_UserErrorCode_Start + 142)	//读卡器最终打开失败