Z991239-6441 #comment feat: 完善读卡异常处理逻辑

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -6635,8 +6635,9 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
 		int ret = PreOnlineJS_ReadViaContact(ctx, m_bSupportRF);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ret:%d, m_bSupportRF:%d", ret, m_bSupportRF);
 		if (ret != 0 && m_bSupportRF)
-			PreOnlineJS_ReadViaRF(ctx, false);
-		PreOnlineJS_ICDataProcess(ctx);
+			ret = PreOnlineJS_ReadViaRF(ctx, false);
+		if (ret == 0)
+			PreOnlineJS_ICDataProcess(ctx);
 	}
 		break;
 	case ReadMode_ContactlessICFirst:
@@ -6646,8 +6647,9 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
 		if (m_bSupportRF)
 			ret = PreOnlineJS_ReadViaRF(ctx, true);
 		if (ret != 0)
-			PreOnlineJS_ReadViaContact(ctx, false);
-		PreOnlineJS_ICDataProcess(ctx);
+			ret = PreOnlineJS_ReadViaContact(ctx, false);
+		if (ret == 0)
+			PreOnlineJS_ICDataProcess(ctx);
 	}
 		break;
 	case ReadMode_ContactlessICOnly:
@@ -6668,8 +6670,9 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
 		int ret = PreOnlineJS_ReadViaContact(ctx, m_bSupportRF);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ret:%d, m_bSupportRF:%d", ret, m_bSupportRF);
 		if (ret != 0 && m_bSupportRF)
-			PreOnlineJS_ReadViaRF(ctx, false);
-		PreOnlineJS_ICDataProcess(ctx);
+			ret = PreOnlineJS_ReadViaRF(ctx, false);
+		if (ret == 0)
+			PreOnlineJS_ICDataProcess(ctx);
 	}
 		break;
 	case ReadMode_Mag_ContactlessICFirst:
@@ -6680,8 +6683,9 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
 		if (m_bSupportRF)
 			ret = PreOnlineJS_ReadViaRF(ctx, true);
 		if (ret != 0)
-			PreOnlineJS_ReadViaContact(ctx, false);
-		PreOnlineJS_ICDataProcess(ctx);
+			ret = PreOnlineJS_ReadViaContact(ctx, false);
+		if (ret == 0)
+			PreOnlineJS_ICDataProcess(ctx);
 	}
 		break;
 	case ReadMode_Mag_ContactlessICOnly: