Z991239-6087 #comment feat: 增加非接上电返回类型判断

Signed-Off-By: commit-hook

DevAdapter/include/CardAssist.cpp

@@ -2697,7 +2697,7 @@ int CCardProcess::DetectAndReadICData(CardReadType eType, DeviceBaseClass *pCard
 	else {
 		//兼容发卡非接上电有的厂商非IC卡也返回成功，直接返回上电失败
 		if (eType == CARD_MACHINE_ISSUER_RF || eType == CARD_MACHINE_ISSUER_STORE_RF) {
-			if (cardType != 'A' && bIssue ) {
+			if ( bIssue && cardType != 'A' && cardType != 'B' && cardType != 'M') {
 				CSimpleStringA errMsg = CSimpleStringA::Format("{\"ErrCode\":2147483646,\"Description\":\"<DetectIfICCard>, not ic card,cardType=%d\"}", cardType);
 				setCardAssistLastErr(Error_Exception, errMsg.GetData(), "DevAdapter::ActiveContactlessICCard");
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<DetectIfICCard>, not ic card.");