Z991239-5722 #comment 去除废弃无用的代码

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -130,8 +130,8 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 			//		--no matter what MachineType is,just call it 
 			pEvt->SetHandled();
 			CardReadEvent* cre = dynamic_cast<CardReadEvent*>(pEvt);
-			bool bCardIssuer, bCardSwiper, bContactlessCard;
-			bCardIssuer = bCardSwiper = bContactlessCard = false;
+			bool bCardIssuer, bContactlessCard;
+			bCardIssuer = bContactlessCard = false;
 			if (m_eMachineType == SP::Module::Comm::RVC_Stand2S || m_eMachineType == SP::Module::Comm::RVC_Stand1SPlus)
 			{
 				ContactlessCardReadTask* cTask = new ContactlessCardReadTask(this);
@@ -154,8 +154,8 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 					GetEntityBase()->GetFunction()->PostThreadPoolTask(iTask);
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask to CardIssuer");
 				}
-				if (bCardIssuer || bCardSwiper || bContactlessCard)
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask, bCardIssuer,bCardSwiper,bContactlessCard:%d,%d,%d", bCardIssuer, bCardSwiper, bContactlessCard);
+				if (bCardIssuer || bContactlessCard)
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask, bCardIssuer,bContactlessCard:%d,%d", bCardIssuer, bContactlessCard);
 				else
 				{
 					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("ReadTask: can't find the right entity.");
@@ -480,7 +480,7 @@ unsigned int CCardReadAdapterFSM::s3_on_event(FSMEvent* pEvt)
 			ret = 0;
 			break;
 		}
-		else if (pEvt->param1 == 9)//CardSwiper Timeout,need to cancel ContactlessCard insert
+		else if (pEvt->param1 == 9)//ContactlessCard Timeout,need to cancel ContactlessCard insert
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ContactlessCard Timeout,need to cancel CardIssuer insert");
 			if (IsContactlessCardSessionOK())
@@ -669,7 +669,7 @@ int CCardReadAdapterFSM::DoWork(int type)
 int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	if (m_bCancelAccept || (m_busCtx.eCardFromWhich == Card_In_ContactlessCard || m_busCtx.eCardFromWhich == Card_In_CardSwiper))
+	if (m_bCancelAccept || (m_busCtx.eCardFromWhich == Card_In_ContactlessCard))
 	{
 		char msg[128];
 		memset(msg, 0, 128);
@@ -992,7 +992,7 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 int CCardReadAdapterFSM::ContactlessCardRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	if (m_bCancelAccept || (m_busCtx.eCardFromWhich == Card_In_CardIssuer || m_busCtx.eCardFromWhich == Card_In_CardSwiper))
+	if (m_bCancelAccept || (m_busCtx.eCardFromWhich == Card_In_CardIssuer))
 	{
 		char msg[128];
 		memset(msg, 0, 128);
@@ -1212,158 +1212,7 @@ int CCardReadAdapterFSM::IssueCard(SpReqAnsContext<CardReadAdapterService_Issue_
 		return 1;
 	}
 }
-int CCardReadAdapterFSM::CardSwiperRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx,int &eRetErr)
-{
-	//if (m_bCancelAccept || (m_busCtx.eCardFromWhich == Card_In_CardIssuer || m_busCtx.eCardFromWhich == Card_In_ContactlessCard))
-	//{
-	//	char msg[128];
-	//	memset(msg, 0, 128);
-	//	sprintf(msg, "Maybe the thread pool is wrong.CardSwiperRead,bCancel:%d,cardpos:%d", m_bCancelAccept, m_busCtx.eCardFromWhich);
-	//	LogWarn(Severity_Middle, Error_NotInit, CardReadAdapter_UserErrorCode_MayBe_ThreadPool_Wrong, msg);
-	//	return 3;
-	//}
-	//ErrorCodeEnum eErr = Error_Unexpect;
-
-	//DWORD elapsed = 0;
-	//DWORD dwStart = GetTickCountRVC();
-	//DWORD dwEnd = GetTickCountRVC();
-	//while (elapsed + ReadCard_Min_Time < ReadCard_TIMEOUT)//要给Read和PreOnline两阶段 至少预留12s左右
-	//{
-	//	if (IsTheEntity(ctx->Req.module, Module_CardSwiper) && IsCardSwiperSessionOK())
-	//	{
-	//		CardSwiperService_Read_Req req;
-	//		CardSwiperService_Read_Ans ans;
-	//		req.aid = ctx->Req.aid;
-	//		req.LightPos = 0;
-	//		if (ctx->Req.lightPos == 0)
-	//			req.LightPos = 7;
-	//		if ((ctx->Req.lightPos&LightPos_CardSwiper_Mag) == LightPos_CardSwiper_Mag)
-	//			req.LightPos += 1;
-	//		if ((ctx->Req.lightPos&LightPos_CardSwiper_IC) == LightPos_CardSwiper_IC)
-	//			req.LightPos += 2;
-	//		if ((ctx->Req.lightPos&LightPos_CardSwiper_RFIC) == LightPos_CardSwiper_RFIC)
-	//			req.LightPos += 4;
-	//		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardSwiperRead, aid:%s,lightPos:%d",(const char*)req.aid,req.LightPos));
 
-	//		DWORD dwUserCode = 0;
-	//		m_busCtx.eCardProcStage = Card_ProcStage_WaitForCard;
-	//		eErr = (*m_pCardSwiper)(EntityResource::getLink().upgradeLink())->Read(req, ans, 60000, dwUserCode);
-	//		eRetErr = eErr;
-	//		if (eErr == Error_Succeed)
-	//		{
-	//			m_busCtx.eCardFromWhich = Card_In_CardSwiper;
-	//			m_busCtx.eCardProcStage = Card_ProcStage_Read;
-	//			//oilyang@20180913 由于CardSwiper没有插卡过程，直接进行pboc流程，需要提前取消其他实体的输入
-	//			if (IsCardIssuerSessionOK())
-	//				(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->CancelInsert();
-	//			if (IsContactlessCardSessionOK())
-	//				(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
-	//			ctx->Ans.track1 = ans.track1;
-	//			ctx->Ans.track2 = ans.track2;
-	//			ctx->Ans.track3 = ans.track3;
-	//			if (ans.ICType == 5)//oilyang@20170204 如果插错卡，反馈为未检测到（有效）卡
-	//				ctx->Ans.ICType = 0;
-	//			else if (ans.ICType == 6)//身份证
-	//				ctx->Ans.ICType = 5;
-	//			else
-	//				ctx->Ans.ICType = ans.ICType;
-	//			ctx->Ans.ICCardNo = ans.ICData;
-	//			ctx->Ans.status = ans.status;
-	//			if (ans.CardPos == 2 || ans.CardPos == 5)
-	//				ctx->Ans.cardPos = CardPos_CardSwiper_IC_Insert;
-	//			else if (ans.CardPos == 4 || ans.CardPos == 6)
-	//				ctx->Ans.cardPos = CardPos_CardSwiper_RFIC;
-	//			else
-	//				ctx->Ans.cardPos = ans.CardPos;
-	//			ctx->Ans.t2Account = ans.t2Account;
-	//			ctx->Ans.t2Region = ans.t2Region;
-	//			ctx->Ans.t2CardSerial = ans.t2CardSerial;
-	//			ctx->Ans.t2CVC = ans.t2CVC;
-	//			ctx->Ans.t2ExpireDate = ans.t2ExpireDate;
-	//			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("ICType:%d,%d, accountNo:%s****%s", ctx->Ans.ICType, ans.ICType,
-	//				(const char*)ctx->Ans.t2Account.SubString(0, 4), (const char*)ctx->Ans.t2Account.SubString(ctx->Ans.t2Account.GetLength() - 4, 4)));
-	//			if (ans.ICType == 3 || ans.ICType == 4)
-	//			{
-	//				CardSwiperService_PreOnline_Req req;
-	//				CardSwiperService_PreOnline_Ans ans;
-	//				req.businessData = ctx->Req.businessData;
-	//				BroadcastReadICing(0);
-	//				dwEnd = GetTickCountRVC();
-	//				DWORD elapse1 = ReadCard_TIMEOUT - (dwEnd-dwStart);
-	//				if(elapse1 < 10000)//PreOnline较慢，预留一定时间
-	//				{
-	//					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("There is no more time to invoke PreOnline");
-	//					ctx->Ans.result = "";
-	//					return 9;
-	//				}
-	//				dwUserCode = 0;
-	//				eErr = (*m_pCardSwiper)(EntityResource::getLink().upgradeLink())->PreOnline(req, ans, elapse1, dwUserCode);
-	//				if (eErr == Error_Succeed)
-	//				{
-	//					ctx->Ans.result = ans.result;
-	//				}
-	//				else if(eErr == Error_Interact){
-	//					if(m_eMachineType == SP::Module::Comm::RVC_Desk2S){
-	//						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper(RVC_Desk2S) return Error_Interact, no need loop.");
-	//						ctx->Ans.result = "";
-	//						ctx->Answer(Error_Unexpect, dwUserCode);
-	//						return 0;
-	//					}
-	//					else
-	//						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper return Error_Interact, need loop.");
-	//					dwEnd = GetTickCountRVC();
-	//					elapsed = dwEnd - dwStart;
-	//					Sleep(200);
-	//					continue;
-	//				}else{
-	//					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardSwiper PreOnline failed return:%d", eErr));
-	//					ctx->Ans.result = "";
-	//				}
-	//			}
-	//		}else if(eErr == Error_Param){
-	//			eErr = Error_Unexpect;
-	//			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("TrackData maybe some wrong");
-	//		}else if(eErr == Error_Interact){
-	//			if(m_eMachineType == SP::Module::Comm::RVC_Desk2S){
-	//				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper(RVC_Desk2S) return Error_Interact, no need loop.");
-	//				return 9;//Maybe vendor's QueryCardStatus timeout
-	//			}else{
-	//				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper ReadCard:ActiveContactlessICCard or ICCommand failed, need loop");
-	//				dwEnd = GetTickCountRVC();
-	//				elapsed = dwEnd - dwStart;
-	//				Sleep(200);
-	//				continue;
-	//			}
-	//		}else{
-	//			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardSwiper Read failed return:%d", eErr));
-	//		}
-	//		if (eErr == Error_TimeOut)
-	//		{
-	//			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper timeout.");
-	//			return 9;
-	//		}
-	//		else if (eErr == Error_InvalidState)
-	//		{
-	//			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardSwiper in error state.");
-	//			return 1;
-	//		}
-	//		else{
-	//			ctx->Answer(eErr, dwUserCode);
-	//			return 0;
-	//		}
-	//	}
-	//	else
-	//	{
-	//		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("can't find the corresponding Entity.req.Module:%d", ctx->Req.module));
-	//		return 1;
-	//	}
-	//	break;
-	//}
-	//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("no more time to loop again");
-	//return 9;
-	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("can't find the corresponding Entity.req.Module:%d", ctx->Req.module));
-	return 1;
-}
 void CCardReadAdapterFSM::CancelRead()
 {
 	ErrorCodeEnum eErr = Error_Unexpect;
@@ -1795,7 +1644,7 @@ int CCardReadAdapterFSM::QueryCardInfo(SpReqAnsContext<CardReadAdapterService_Qu
 void CCardReadAdapterFSM::CheckAndReconnectSession()
 {
 	ErrorCodeEnum eErr = Error_Unexpect;
-	int cardIssuerCount = 0, contactlessCardCount = 0, cardSwiperCount = 0;
+	int cardIssuerCount = 0, contactlessCardCount = 0;
 	while (1)
 	{
 		//the first time to connect or need to reconnect
@@ -1908,12 +1757,7 @@ bool CCardReadAdapterFSM::IsContactlessCardSessionOK()
 		return true;
 	return false;
 }
-bool CCardReadAdapterFSM::IsCardSwiperSessionOK()
-{
-	//if (m_pCardSwiper != NULL && !m_pCardSwiper->QuerySessionClosed())
-	//	return true;
-	return false;
-}
+
 bool CCardReadAdapterFSM::IsTheEntity(int module,ModuleType eModule)
 {
 	if (module == 0)
@@ -2371,19 +2215,14 @@ int CCardReadAdapterFSM::OpenSafeLock(SpReqAnsContext<CardReadAdapterService_Ope
 }
 int CCardReadAdapterFSM::MagTransferInit(SpReqAnsContext<CardReadAdapterService_MagTransferInit_Req, CardReadAdapterService_MagTransferInit_Ans>::Pointer ctx)
 {
-	LOG_FUNCTION();
-
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardSwiper is not ok.");
 	ctx->Answer(Error_Unexpect);
-
 	return 0;
 }
 int CCardReadAdapterFSM::QueryConnInfo(SpReqAnsContext<CardReadAdapterService_QueryConnInfo_Req, CardReadAdapterService_QueryConnInfo_Ans>::Pointer ctx)
 {
-
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardSwiper is not ok.");
 	ctx->Answer(Error_Unexpect);
-
 	return 0;
 }
 void CCardReadAdapterFSM::DoExit()

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -110,8 +110,7 @@ enum CardFromWhichEntity//卡片信息从哪个实体返回
 {
 	Card_In_No_Where,
 	Card_In_CardIssuer,
-	Card_In_ContactlessCard,
-	Card_In_CardSwiper,
+	Card_In_ContactlessCard
 };
 enum CardProcStage//stage of card process
 {
@@ -142,19 +141,7 @@ enum CardPosType
 	CardPos_CardSwiper_RFIC,//3 : CardSwiper非接卡
 	CardPos_CardIssuer_Stand2S,//4：卡片在大机卡机里面
 	CardPos_ContactlessCard,//5：卡片在大机非接上面
-	CardPos_CardIssuer_Split,//6：卡片在便携发卡机里面
-
-	//CardPos_No_Card = 0,//0：检查超时，未发现设备有卡。
-	//CardPos_CardSwiper_Mag_OK,//1：CardSwiper刷卡且有磁道数据（至少有二磁道数据）
-	//CardPos_CardSwiper_IC,//2：CardSwiper插IC卡
-	//CardPos_CardSwiper_Mag_No_Track2,//3：CardSwiper刷卡，但二磁道数据缺失
-	//CardPos_CardSwiper_RFIC,//4 : CardSwiper非接卡
-	//CardPos_CardSwiper_Invalid,//5：CardSwiper插入接触卡, 卡面插反或无效卡
-	//CardPos_CardSwiper_ID,//6：CardSwiper非接IC位发现身份证
-	//CardPos_CardIssuer_Stand2S,//7：卡片在大机卡机里面
-	//CardPos_ContactlessCard_OK,//8：卡片在大机非接上面
-	//CardPos_ContactlessCard_ID,//9：在大机非接位发现身份证
-	//CardPos_CardIssuer_Split,//10：卡片在便携发卡机里面 
+	CardPos_CardIssuer_Split//6：卡片在便携发卡机里面
 };
 enum LightPos
 {
@@ -170,7 +157,6 @@ class CCardReadAdapterEntity;
 class CCardReadAdapterFSM;
 const int ONE_K = 1024;
 
-
 class CardIssueEvent : public FSMEvent
 {
 public:
@@ -767,16 +753,6 @@ public:
 	virtual ErrorCodeEnum OnInit();
 	virtual ErrorCodeEnum OnExit();
 
-	//unsigned int sReady_on_event(FSMEvent* event) 
-	//{
-	//	if (event->iEvt == USER_EVT_READ) {
-	//		// new read task
-	//		
-	//		event->SetHandled();
-	//		return 0;
-	//	}
-	//}
-
 	void s0_on_entry();
 	void s0_on_exit();
 	unsigned int s0_on_event(FSMEvent* event);
@@ -799,7 +775,6 @@ public:
 	int DoWork(int type);
 	int CardIssuerRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx);
 	int ContactlessCardRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx);
-	int CardSwiperRead(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx,int &eRetErr);
 	int IssueCard(SpReqAnsContext<CardReadAdapterService_Issue_Req, CardReadAdapterService_Issue_Ans>::Pointer ctx);
 	void CancelRead();
 	void ReadWaitMore();
@@ -864,16 +839,14 @@ private:
 	SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer m_readCtx;
 
 	//m_lastModule:0~7
-	//0:all; 1:CardIssuer; 2:ContactlessCard; 4:CardSwiper
+	//0:all; 1:CardIssuer; 2:ContactlessCard
 	int m_lastModule,m_lastS2Event, m_lastS2EvtParam1;
 	SP::Module::Comm::What m_eMachineType;
 	WORD m_majorVerion,m_minorVerion;
 	///
 	int m_resetTimes;
-	HMODULE m_hVerdorDll;
-	//GUIConsoleService_ClientBase *m_pGUIConsoleClient;
 	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore
-		, m_bCDA, m_bIssuingExit, m_bCardIssued, m_bCaptureCfgFlag, m_bHasHopper[3], m_bBTConncting
+		, m_bCDA, m_bIssuingExit, m_bCardIssued, m_bCaptureCfgFlag, m_bHasHopper[3]
 		, m_bCardActiveNotify;
 	ErrorCodeEnum m_testResult;
 	//m_CardInit,m_CardRemains,m_CardIssued,m_CardMixed,m_CardPercent
@@ -888,16 +861,14 @@ private:
 
 	char *m_pDataToARQC;
 	long xxTest;
-	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_csDevSN, m_terminalNo, m_devSN;
+	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_csDevSN, m_terminalNo;
 
 	char m_AuthCode[2];
-	bool m_bBTConnected;
 	SpReqAnsContext<CardReadAdapterService_PreOnlineOnStore_Req, CardReadAdapterService_PreOnlineOnStore_Ans>::Pointer m_crossCtx;
 	ULONGLONG m_ullCrossStart;
 
 	bool IsCardIssuerSessionOK();
 	bool IsContactlessCardSessionOK();
-	bool IsCardSwiperSessionOK();
 	bool IsTheEntity(int module,ModuleType eModule);
 	bool CheckHBSessionOrToConnect();
 	//oilyang@20230614 跨及时因为卡片的实际交易发生在卡库，需要在发起端对返回的UserErrorCode做二次映射，方便客户理解提示信息
@@ -979,20 +950,7 @@ struct ContactlessCardReadTask : public ITaskSp
 		fsm->PostEventFIFO(e);
 	}
 };
-struct CardSwiperReadTask : public ITaskSp
-{
-	CCardReadAdapterFSM* fsm;
-	SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx;
-	CardSwiperReadTask(CCardReadAdapterFSM* f) : fsm(f) {}
-	int x;
-	void Process()
-	{
-		CardReadFinishedEvent *e = new CardReadFinishedEvent();
-		e->ctx = ctx;
-		e->param1 = fsm->CardSwiperRead(ctx,x);
-		fsm->PostEventFIFO(e);
-	}
-};
+
 struct WriteTask : public ITaskSp
 {
 	CCardReadAdapterFSM* fsm;

Module/mod_FingerPrint/CMakeLists.txt

@@ -13,7 +13,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMOM_INCLUDE_DIR}
 	${DevHeadPath}
-	${MODULE_BASE_DIR}/mod_cardswiper
 	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 

Module/mod_ResourceWatcher/CMakeLists.txt

@@ -55,7 +55,6 @@ endif(MSVC)
 target_link_libraries(${MODULE_NAME}  ${${MODULE_PREFIX}_LIBS})  
 
 target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${MODULE_BASE_DIR}/mod_cardswiper
     ${MODULE_BASE_DIR}/mod_healthmanager
     ${MODULE_BASE_DIR}/mod_UpgradeMgr
     ${MODULE_BASE_DIR}/mod_chromium

Module/mod_heartbeat/mod_heartbeat.h

@@ -31,8 +31,6 @@ public:
 		LOG_FUNCTION();
 		ErrorCodeEnum rt = m_fsm.Init(this);
 		GetFunction()->RegistSysVarEvent("TerminalStage", this);
-		CUUID uuidCardSwiper;
-		GetFunction()->SubscribeBroadcast("CardSwiper", "", this, uuidCardSwiper);
 		pTransactionContext->SendAnswer(rt);
 	}
 	virtual void OnPrePause(CSmartPointer<ITransactionContext> pTransactionContext)

Module/mod_pinpad/PinPadFSM.cpp

@@ -318,7 +318,6 @@ int CPinPadFSM::Initial()
 
 	CSimpleStringA csDepPath(""), csBackslash(SPLIT_SLASH_STR);
 
-	m_devSN = "";
 	eErrDev = pEntity->LoadVendorLibName();
 	if (eErrDev != Error_Succeed)
 	{

Module/mod_pinpad/PinPadFSM.h

@@ -174,7 +174,7 @@ public:
 		, m_dwDevCommFailCount(0), m_dwPinPadRunCount(0), m_eDevState(DEVICE_STATUS_NOT_READY), m_encryptkey(1)
 		, m_bSM(false), m_bSMLoaded(false), m_iInWhatPage(PageType_Init), m_szModel(""), m_szType("")
 		, m_szVendor(""),m_csMachineType(true), m_csSite(true), m_terminalNo(true), m_port(true), m_Baudrate(true)
-		, m_devSN(""), m_bPinInputJS(false), m_bUseBackupSN(true){
+		, m_bPinInputJS(false), m_bUseBackupSN(true){
 			HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x206);
 			ZeroMemory(&m_adapterInfo, sizeof(m_adapterInfo));
 	}
@@ -289,7 +289,7 @@ private:
 	bool m_bFrontCancel,m_bWaitingMore,m_bExit,m_bPlainPin,m_bEntityExit
 		,m_bPinInput,m_bLoadKey,m_bEncrypt,m_bSM,m_bSMLoaded, m_bPinInputJS, m_bUseBackupSN/*if use backup sn*/;
 	ULLINT m_ullBeginTime, m_ullEndTime,m_ullConnectCost;
-	CSimpleStringA m_deviceNo, m_port, m_Baudrate, m_devCheckData,m_keySNSM,m_szModel,m_szType,m_szVendor,m_devSN/*fwb SN*/;
+	CSimpleStringA m_deviceNo, m_port, m_Baudrate, m_devCheckData,m_keySNSM,m_szModel,m_szType,m_szVendor;
 	char m_buf[4];
 	DWORD m_dwDevCommFailCount,m_dwPinPadRunCount;
 	DevStateEnum m_eDevState;