Z991239-6494 #comment feat: 去除实体定义的GetDevStatus方法

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -751,13 +751,9 @@ unsigned int CCardIssuerFSM::s5_on_event(FSMEvent* pEvt)
 				pCRNFE->ctx->Answer(Error_DevMedia);
 				ret = 2;
 			}
-			else
-			{
-				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("Read finished,获取设备状态GetDevStatus失败");
-				DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, 10, "QLR040222003", CombineJsonContext("Read finished, GetDevStatus err"));
-				pCRNFE->ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
-				
-				ret = 1;
+			else {
+				pCRNFE->ctx->Answer(Error_Succeed);
+				ret = 0;
 			}
 		}
 		break;
@@ -1521,42 +1517,42 @@ int FindHexCharPosition(LPBYTE data, BYTE hexChar, int len)
 	return ret;
 }
 
-bool CCardIssuerFSM::GetDevStatus(bool bPrint)
-{
-	int getDevInfoCount = 0;
-	static unsigned int lightStatus = 0;
-	ErrorCodeEnum errCode;
-	long l_beginTime, l_endTime;
-	do{
-		l_beginTime = RVCGetTickCount();
-		errCode = m_hDevHelper->GetDevStatus(m_devStatus);
-		l_endTime = RVCGetTickCount();
-		
-
-		if (Error_Succeed == errCode) 
-		{
-			if (bPrint) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("GetDevStatus::GetDevStatus eMedia: %d", m_devStatus.eMedia);
-			}
-			if (_strnicmp("RVC.CardPrinter", m_csMachineType, strlen("RVC.CardPrinter")) == 0)
-			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("kaku tape(flat%d,concave:%d,gold:%d,silver:%d",
-						m_devStatus.eKakuTape[0], m_devStatus.eKakuTape[1], m_devStatus.eKakuTape[2], m_devStatus.eKakuTape[3]);
-			}
-			return true;
-		}
-		else
-		{
-			if (bPrint) {
-				SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-			}
-
-			getDevInfoCount++;
-			Sleep(300);
-		}
-	} while (getDevInfoCount < GET_DEV_STATUS_COUNT);
-	return false;
-}
+//bool CCardIssuerFSM::GetDevStatus(bool bPrint)
+//{
+//	int getDevInfoCount = 0;
+//	static unsigned int lightStatus = 0;
+//	ErrorCodeEnum errCode;
+//	long l_beginTime, l_endTime;
+//	do{
+//		l_beginTime = RVCGetTickCount();
+//		errCode = m_hDevHelper->GetDevStatus(m_devStatus);
+//		l_endTime = RVCGetTickCount();
+//		
+//
+//		if (Error_Succeed == errCode) 
+//		{
+//			if (bPrint) {
+//				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("GetDevStatus::GetDevStatus eMedia: %d", m_devStatus.eMedia);
+//			}
+//			if (_strnicmp("RVC.CardPrinter", m_csMachineType, strlen("RVC.CardPrinter")) == 0)
+//			{
+//				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("kaku tape(flat%d,concave:%d,gold:%d,silver:%d",
+//						m_devStatus.eKakuTape[0], m_devStatus.eKakuTape[1], m_devStatus.eKakuTape[2], m_devStatus.eKakuTape[3]);
+//			}
+//			return true;
+//		}
+//		else
+//		{
+//			if (bPrint) {
+//				SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
+//			}
+//
+//			getDevInfoCount++;
+//			Sleep(300);
+//		}
+//	} while (getDevInfoCount < GET_DEV_STATUS_COUNT);
+//	return false;
+//}
 int CCardIssuerFSM::Reset()
 {
 	LOG_FUNCTION();
@@ -2812,10 +2808,8 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStoreService_Read
 	{
 		bICOK = false;
 		ctx->Ans.status = 1;
-		if (GetDevStatus())
-			return 0;
-		else
-			return 1;
+		return 0;
+
 	}
 	bICOK = true;
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
@@ -3062,10 +3056,8 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStoreService_Read_Req,
 	if (!bReadCardInfo)
 	{
 		ctx->Ans.status = 1;
-		if (GetDevStatus())
-			return 0;
-		else
-			return 1;
+		return 0;
+
 	}
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
 	return 0;

Module/mod_cardissuerstore/CardIssuerStoreFSM.h

@@ -1218,7 +1218,7 @@ public:
 	
 	ErrorCodeEnum OpenDevice(BYTE btOpenType, const char *pDevSN);
 	int Initial();
-	bool GetDevStatus(bool bPrint=true);
+	//bool GetDevStatus(bool bPrint=true);
 	int UnAcceptCard();
 	int CaptureCard(SpReqAnsContext<CardIssuerStoreService_Capture_Req,CardIssuerStoreService_Capture_Ans>::Pointer ctx);
 	int EjectCard(SpReqAnsContext<CardIssuerStoreService_Eject_Req,CardIssuerStoreService_Eject_Ans>::Pointer ctx);