!10907 卡库卡机的DevOpenEx不再重试；修改大机卡机xml文件的返回值描述；去掉旧读卡接口未读卡成功时查询卡片状态的逻辑

Merge pull request !10907 from 80174847/oilyang_fixed_everything

Module/mod_CardIssuerStand/CardIssuerStand.xml

@@ -223,7 +223,7 @@
 		</twoway>
 		<!--查询卡机设备状态接口 -->
 		<!--1、卡机未成功打开, rtaCode为RTA2311-->
-		<!--2、卡库正在打开中, rtaCode为RTA2311-->		
+		<!--2、卡库正在打开中, rtaCode为RTA2313-->		
 		<twoway name="GetDevInfo" overlap="true" method_id="65535" jsflag="true">
 			<req>
 			</req>
@@ -242,8 +242,8 @@
     <!--为了把读卡情况完整的反馈，返回规则如下：-->
     <!--1、对于单路（只读磁或只读芯）的请求，失败则返回报错-->
     <!--2、对于双路的请求，一律返回成功，增加magMsg、icMsg字段，分别在对应通路异常时填充“[RTAxxxx]描述信息”-->
-    <!--相关的报错信息如下：发卡时，上电失败,rtaCode为RTA230V；发卡时，上电失败（非接）,rtaCode为RTA2327；上电失败,rtaCode为RTA230M；上电失败（非接）),rtaCode为RTA2326；
-				读卡失败,读取IC数据失败,rtaCode为RTA2302；读卡失败,读取IC数据失败（非接）,rtaCode为RTA23C9-->
+    <!--相关的报错信息如下：接触下压触点失败,rtaCode为RTA23C7；上电失败,rtaCode为RTA23CT；读卡失败,rtaCode为RTA2302；RF上电失败,rtaCode为RTA23C6；
+				RF读卡失败, rtaCode为RTA23C9；卡片移动失败, rtaCode为RTA23BE-->
 		<twoway name="ReadJS" overlap="true" method_id="40" jsflag="true">
 			<req>
 				<!--读取模式:1 读磁、2 读芯，接触优先、3 读芯，非接优先、4 读芯，只走非接、5 读磁读芯，接触优先、6 读磁读芯非接优先、7 读磁读芯，只走非接-->
@@ -293,9 +293,10 @@
 		
 		<!--吐卡接口-->
 		<!--1、卡机未成功打开, rtaCode为RTA2311-->
-		<!--2、卡机吐卡失败, rtaCode为RTA2308-->
+		<!--2、卡机吐卡失败, rtaCode为RTA23BE-->
 		<!--3、超时未取卡，已吞卡, rtaCode为RTA23CU-->
 		<!--4、超时未取卡，吞卡失败, rtaCode为RTA23CV-->
+    <!--5、等待取卡过程中，查询卡片状态失败, rtaCode为RTA2322-->
 		<twoway name="EjectJS" overlap="true" method_id="42" jsflag="true">
 			<req>
 			</req>
@@ -305,7 +306,7 @@
 		
 		<!--吞卡接口-->
 		<!--1、卡机未成功打开, rtaCode为RTA2311-->
-		<!--2、吞卡失败, rtaCode为RTA2307-->
+		<!--2、吞卡失败, rtaCode为RTA23BE-->
 		<twoway name="CaptureJS" overlap="true" method_id="43" jsflag="true">
 			<req>
 				<!--吞卡原因码-->
@@ -337,7 +338,7 @@
 		<!--5、卡箱1未检测到卡片, rtaCode为RTA230E-->
 		<!--6、卡箱2未检测到卡片, rtaCode为RTA230F-->
 		<!--7、卡箱3未检测到卡片, rtaCode为RTA230G-->
-		<!--8、从卡箱移动卡片到读卡器失败, rtaCode为RTA2306-->
+		<!--8、从卡箱移动卡片到读卡器失败, rtaCode为RTA23BE-->
 		<!--9、卡箱号不是1-3, rtaCode为RTA23CW-->
 		<twoway name="IssueFromBoxJS" overlap="true" method_id="45" jsflag="true">
 			<req>

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -2103,6 +2103,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 	DWORD dwStart = GetTickCountRVC();
 	MagTracks magTracks;
 	int readTries = 0;
+	DWORD dwCode = 0;
 	memset(magTracks.track[0].data, 0, sizeof(magTracks.track[0].data));
 	memset(magTracks.track[1].data, 0, sizeof(magTracks.track[1].data));
 	memset(magTracks.track[2].data, 0, sizeof(magTracks.track[2].data));
@@ -2116,7 +2117,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 				magTracks.track[1].eStatus, magTracks.track[2].eStatus, magTracks.track[1].dwSize, magTracks.track[2].dwSize);
 		}
 		else {
-			SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::MagRead err");
+			dwCode = SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::MagRead err");
 
 		}
 
@@ -2132,12 +2133,15 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 
 		ctx->Ans.t2Account = ctx->Ans.ICData = "";
 		readTries++;
+		//oiltmp why? want to do what?
 		if (magTracks.track[1].dwSize > sizeof(magTracks.track[1].data) || magTracks.track[2].dwSize > sizeof(magTracks.track[2].data))
 		{
 			errMsg = CSimpleString::Format("MagRead, trackSize maybe wrong:t2Size:%d(%d), t3Size:%d(%d)",
 				magTracks.track[1].dwSize, sizeof(magTracks.track[1].data),
 				magTracks.track[2].dwSize, sizeof(magTracks.track[2].data));
 			LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_TrackSize_Wrong, errMsg.GetData());
+			dwCode = CardIssuer_UserErrorCode_TrackSize_Wrong;
+			ctx->Ans.status = 1;
 			break;
 		}
 
@@ -2148,6 +2152,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
 				LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_Track2Size_Wrong, errMsg.GetData());
+				dwCode = CardIssuer_UserErrorCode_TrackSize_Wrong;
 				ctx->Ans.status = 1;
 				break;
 			}
@@ -2255,7 +2260,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 			CSimpleStringA csDevApi("");
 			DWORD dwDevApi = 0;
 			GetDevApiCodeAndName(retDetect, dwDevApi, csDevApi);
-			SetErrorAndLog(Error_Unexpect, dwDevApi, csDevApi, __FUNCTION__, bContinue && IsInBusiness(), l_endTime - l_beginTime);
+			dwCode = SetErrorAndLog(Error_Unexpect, dwDevApi, csDevApi, __FUNCTION__, bContinue && IsInBusiness(), l_endTime - l_beginTime);
 		}
 		
 		if (Error_Succeed == eMagReadErr && magTracks.track[1].eStatus == CI_DATA_OK)
@@ -2298,7 +2303,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 			l_endTime = GetTickCountRVC();
 
 			if (eErr != Error_Succeed) {
-				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::DeactivateICCard err");
+				dwCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::DeactivateICCard err");
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactivateICCard").setCostTime(l_endTime - l_beginTime)("ReadCard_Contact::DeactivateICCard");
@@ -2309,7 +2314,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 			l_endTime = GetTickCountRVC();
 
 			if (eErr != Error_Succeed) {
-				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::ReleaseIC err");
+				dwCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::ReleaseIC err");
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReleaseIC").setCostTime(l_endTime - l_beginTime)("ReadCard_Contact::ReleaseIC");
@@ -2323,18 +2328,9 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 	if (!bReadCardInfo)
 	{
 		ctx->Ans.status = 1;
-		m_ullBeginTime = GetTickCountRVC();
-		eErr = m_hDevHelper->GetDevStatus(m_devStatus);
-		m_ullEndTime = GetTickCountRVC();
-		if (eErr != Error_Succeed)
-		{
-			DWORD dwCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, !bContinue && IsInBusiness(), m_ullEndTime - m_ullBeginTime, "QLR040220303");
-			if (!bContinue)
-				ctx->Answer(Error_Unexpect, dwCode);
-			return 1;
-		}
-		else
-			return -1;
+		if (!bContinue)
+			ctx->Answer(Error_Unexpect, dwCode);
+		return 1;
 	}
 	else
 	{

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -35,7 +35,7 @@ const int MAX_RESET_TIMEROUT = 5000;
 const int MAX_RESET_TIMES_PERIOD = 0;//oiltmp configure to ini file?
 
 const int READ_TRY_INTERVAL = 300;
-const int INIT_TRY_NUM = 3;
+const int INIT_TRY_NUM = 1;
 const int ACCEPT_TRY_INTERVAL = 500;
 const int ACCEPT_TRY_NUM = 110;