Z991239-5424 #comment feat: 下线Desk2S机型的功能

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -124,24 +124,16 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 		case USER_EVT_READ:
 		{
 			//oilyang@20200426 according to MachineType ***AND MachineVersion*** to decide which Card-like entity to be called
-			//RVC.Stand2S, RVC.PAD, RVC.IL, RPM.Stand1S, RVC.CardStore, RVC.Wall, RVC.Desk2S, RVC.Desk1S
+			//RVC.Stand2S, RVC.CardStore
 			//	ContactlessCard:
-			//		--RVC.Stand2S, RVC.Desk2S(all MachineVersion), RVC.Desk1S(all MachineVersion)
-			//	CardSwiper:
-			//		--except for RVC.Stand2S,RVC.CardStore,RVC.CardPrinter
-			//		--oilyang@20200730 according to meeting with Ratail/Test/Hangzhou 
-			//			Desk2S 2.1 have no CardSwiper,so no need call it
+			//		--RVC.Stand2S
 			//	CardIssuer:
-			//		--no matter what MachineType is,just call it ,except for "RVC.Desk2S 2.0"
-			//		-- see the following "except for cross call" ,what the f**king line means?
+			//		--no matter what MachineType is,just call it 
 			pEvt->SetHandled();
 			CardReadEvent* cre = dynamic_cast<CardReadEvent*>(pEvt);
 			bool bCardIssuer, bCardSwiper, bContactlessCard;
 			bCardIssuer = bCardSwiper = bContactlessCard = false;
-			if (m_eMachineType == SP::Module::Comm::RVC_Stand2S 
-				|| m_eMachineType == SP::Module::Comm::RVC_Desk2S
-                || m_eMachineType == SP::Module::Comm::RVC_Stand1SPlus
-				)
+			if (m_eMachineType == SP::Module::Comm::RVC_Stand2S || m_eMachineType == SP::Module::Comm::RVC_Stand1SPlus)
 			{
 				ContactlessCardReadTask* cTask = new ContactlessCardReadTask(this);
 				cTask->ctx = cre->ctx;
@@ -1932,8 +1924,6 @@ bool CCardReadAdapterFSM::IsTheEntity(int module,ModuleType eModule)
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("req.module is 99,machineType is:%s",m_csMachineType.GetData());
 		//oilyang@20200730 according to meeting with Ratail/Test/Hangzhou
-		//Desk2S 2.1 can insert into CardIssuer
-		//oilyang@20200612 if "RVC.Desk2S" ,no need to call  CardIssuer(insert card)
 		//from guodan 20180905
 		//99：进卡读卡，功能集向除蓝牙发卡机之外的读卡实体发出进卡读卡指令。
 		
@@ -1942,8 +1932,7 @@ bool CCardReadAdapterFSM::IsTheEntity(int module,ModuleType eModule)
 			if (m_eMachineType == SP::Module::Comm::RVC_Stand2S
 				|| m_eMachineType == SP::Module::Comm::RVC_CardStore
 				|| m_eMachineType == SP::Module::Comm::RVC_CardPrinter
-				|| m_eMachineType == SP::Module::Comm::RVC_Stand1SPlus
-				|| m_eMachineType == SP::Module::Comm::RVC_Desk2S && m_majorVerion == 2 && m_minorVerion == 1)
+				|| m_eMachineType == SP::Module::Comm::RVC_Stand1SPlus)
 				return true;
 			else
 				return false;

Module/mod_CardReadAdapter/mod_CardReadAdapter.cpp

@@ -295,11 +295,7 @@ void CCardReadAdapterEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntity
 			SpBuffer2Object(Buffer, fc);
 
 			if (fc.status == 3){//oilyang@20181210 cancel read as have detect card in ContactlessCard
-				if(m_fsm.GetMachineType() == SP::Module::Comm::RVC_Desk2S)
-					m_fsm.CancelReadForEntity(Module_CardSwiper);
-				else{
-					m_fsm.CancelReadForEntity(Module_CardIssuer);
-				}
+				m_fsm.CancelReadForEntity(Module_CardIssuer);
 			}
 			else
 			{