Browse Source

#IQRV #comment CTX接口去除

80374374 1 year ago
parent
commit
a1b1741de1

+ 1 - 19
Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -28,12 +28,6 @@ using namespace CardIssuerStand;
 using namespace CardIssuerStore;
 using namespace ContactlessCard;
 
-
-struct CtxInfo
-{
-	int dataSize;
-	LPVOID pCtx;
-};
 enum EvtType
 {
 	USER_EVT_TEST = EVT_USER + 1,
@@ -839,18 +833,7 @@ public:
 	int Test2(SpReqAnsContext<CardReadAdapterService_Test2_Req, CardReadAdapterService_Test2_Ans>::Pointer ctx);
 	void SelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext);
 	void SetReadCtx(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx) { m_readCtx = ctx; }
-	template <class TReq, class TAns>
-	void SaveCtx(int methodID, CSmartPointer<SpReqAnsContext<TReq, TAns> > ctx)
-	{
-		m_mapCtx[methodID].pCtx = static_cast<void*>(ctx.GetRawPointer());
-	}
-	LPVOID  GetCtx(int methodID)
-	{
-		if (m_mapCtx.find(methodID) != m_mapCtx.end())
-			return m_mapCtx[methodID].pCtx;
-		else
-			return NULL;
-	}
+
 	int LocalCallHeartBeat(int method, CBlob &bbSend, bool bTwoWay=false);
 	bool GetAttachedTerminal(CSimpleStringA &csTerm);
 	int CrossTermCall(SpReqAnsContext<CardReadAdapterService_CrossTermCall_Req, CardReadAdapterService_CrossTermCall_Ans>::Pointer ctx);
@@ -909,7 +892,6 @@ private:
 
 	char m_AuthCode[2];
 	bool m_bBTConnected;
-	map<int, CtxInfo> m_mapCtx;
 	SpReqAnsContext<CardReadAdapterService_PreOnlineOnStore_Req, CardReadAdapterService_PreOnlineOnStore_Ans>::Pointer m_crossCtx;
 	ULONGLONG m_ullCrossStart;
 

+ 1 - 13
Module/mod_IDCertificate/IDCertFSM.h

@@ -285,11 +285,7 @@ public:
 	bool GetDevInitFlag() { return m_devInit; }
 #endif
 
-	template <class TReq,class TAns>
-	void SaveCtx(int methodID, CSmartPointer<SpReqAnsContext<TReq, TAns> > ctx)
-	{
-		m_mapCtx[methodID].pCtx = static_cast<void*>(ctx.GetRawPointer());
-	}
+
 	void SaveCtxAA(int methodID, SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadAndScan_Ans>::Pointer ctx)
 	{
 		m_readAndScanCtx = ctx;
@@ -298,13 +294,6 @@ public:
 	{
 		m_readAndScanUTF8Ctx = ctx;
 	}
-	LPVOID  GetCtx(int methodID) 
-	{ 
-		if (m_mapCtx.find(methodID) != m_mapCtx.end())
-			return m_mapCtx[methodID].pCtx;
-		else
-			return NULL;
-	}
 	int Initial();
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 	bool IsRVCPAD() { return !m_csMachineType.Compare("RVC.PAD", true); }
@@ -347,7 +336,6 @@ private:
 	CSimpleStringA m_csMachineType, m_csSite, m_terminalNo;
 	CSimpleStringA m_devVendor, m_devVer, m_devBatch, m_devSN/*fwb SN*/;
 	CSimpleStringA transImgMsg;
-	map<int, CtxInfo> m_mapCtx;
 	SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadAndScan_Ans>::Pointer m_readAndScanCtx;
 	SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCert_ReadAndScanUTF8_Ans>::Pointer m_readAndScanUTF8Ctx; //ex7
 #ifdef RVC_OS_WIN

+ 0 - 6
Module/mod_pinpad/PinPadFSM.h

@@ -44,12 +44,6 @@ using namespace PinPad;
 #include <map>
 using namespace std;
 
-struct CtxInfo
-{
-	int dataSize;
-	LPVOID pCtx;
-};
-
 class CPinPadEntity;
 class CPinPadFSM;