Z991239-4398 #comment ContactlessCard的双版本代码功能同步

Module/mod_ContactlessCard/CMakeLists.txt

@@ -15,10 +15,11 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${CONAN_INCLUDE_DIRS_JSONCPP}
 )
 
 # 添加实体需要依赖的其他共享库（包括系统库）
-set(${MODULE_PREFIX}_SYSLIBS libpublicFun)
+set(${MODULE_PREFIX}_SYSLIBS libpublicFun ${CONAN_PKG_LIBS_JSONCPP})
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS})
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${${MODULE_PREFIX}_SYSLIBS})
 

Module/mod_ContactlessCard/ContactlessCard_UserErrorCode.h

@@ -14,7 +14,7 @@
 
 
 //预留一部分用于CardAssist.cpp中的报错告警
-//自ContactlessCard_UserErrorCode_Start + 11 ~ CardIssuer_UserErrorCode_Start + 20
+//自ContactlessCard_UserErrorCode_Start + 11 ~ ContactlessCard_UserErrorCode_Start + 20
 #define ContactlessCard_UserErrorCode_ActiveContactlessICCard_Failed						(ContactlessCard_UserErrorCode_Start + 11)	//DetectIfICCard调用ContactIC失败
 #define ContactlessCard_UserErrorCode_RFTypeABCommand_Failed								(ContactlessCard_UserErrorCode_Start + 12)	//BuildSupportedAppList调用RFTypeABCommand失败
 #define ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid							(ContactlessCard_UserErrorCode_Start + 13)	//APDU接收到的数据无效

Module/mod_ContactlessCard/ContactlessCard_client_g.h

@@ -32,6 +32,7 @@ public:
 	}
 	void OnClose(ErrorCodeEnum)
 	{
+		Dbg("session closed.");
 		bSessionClosed = true;
 	}
 	bool QuerySessionClosed()

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -12,426 +12,408 @@
 #include "ContactlessCard_server_g.h"
 #include "ContactlessCard_msg_g.h"
 #include "ContactlessCard_UserErrorCode.h"
-
+#include "json/json.h"
 enum EvtType
 {
-    USER_EVT_TEST = EVT_USER + 1,
-    USER_EVT_QUIT,
-    USER_EVT_INIT,
-    USER_EVT_INITFINISHED,
-    USER_EVT_ACCEPT,
-    USER_EVT_ACCEPT_CANCEL,
-    USER_EVT_ACCEPTFINISHED,
-    USER_EVT_EJECT,
-    USER_EVT_EJECTFINISHED,
-    USER_EVT_WAITFINISHED,
-    USER_EVT_CAPTUREFINISHED,
-    USER_EVT_WAITFETCHINGTIMEOUT,
-    USER_EVT_PREONLINE,
-    USER_EVT_POSTONLINE,
-    USER_EVT_PREONLINEFINISHED,
-    USER_EVT_POSTONLINEFINISHED,
-    USER_EVT_RESET,
-    USER_EVT_RESETFINISHED,
-    USER_EVT_EXIT,
-    USER_EVT_READ,
-    USER_EVT_READ_FINISHED,
-    USER_EVT_QUERY_CARD_INFO,
-    USER_EVT_QUERY_CARD_INFO_FINISHED,
+	USER_EVT_TEST = EVT_USER+1,
+	USER_EVT_QUIT,
+	USER_EVT_INIT,
+	USER_EVT_INITFINISHED,
+	USER_EVT_ACCEPT,
+	USER_EVT_ACCEPT_CANCEL,
+	USER_EVT_ACCEPTFINISHED,
+	USER_EVT_EJECT,
+	USER_EVT_EJECTFINISHED,
+	USER_EVT_WAITFINISHED,
+	USER_EVT_CAPTUREFINISHED,
+	USER_EVT_WAITFETCHINGTIMEOUT,
+	USER_EVT_PREONLINE,
+	USER_EVT_POSTONLINE,
+	USER_EVT_PREONLINEFINISHED,
+	USER_EVT_POSTONLINEFINISHED,
+	USER_EVT_RESET,
+	USER_EVT_RESETFINISHED,
+	USER_EVT_EXIT,
+	USER_EVT_READ,
+	USER_EVT_READ_FINISHED,
+	USER_EVT_QUERY_CARD_INFO,
+	USER_EVT_QUERY_CARD_INFO_FINISHED,
 
 };
 
-
 using namespace ContactlessCard;
-
+#ifdef RVC_OS_WIN
+typedef int(*lpCMBdecodeMag2)(char* Mag2Data, char * data);
+typedef int(*lpCMBdecodeEx)( char* MagData, char * type, char * data);
+#else
 using lpCMBdecodeMag2 = int(*)(char* mag2Data, char* data);
 using lpCMBdecodeEx = int(*)(char* magData, char* type, char* data);
+#endif
 
 class CContactlessCardEntity;
 class CContactlessCardFSM;
 
 struct Track2Data
 {
-    int status;
-    CSimpleStringA t2Account;
-    CSimpleStringA t2Region;
-    CSimpleStringA t2CardSerial;
-    CSimpleStringA t2CVC;
-    CSimpleStringA t2ExpireDate;
+	int status;
+	CSimpleStringA t2Account;
+	CSimpleStringA t2Region;
+	CSimpleStringA t2CardSerial;
+	CSimpleStringA t2CVC;
+	CSimpleStringA t2ExpireDate;
 };
 struct CMBBin
 {
-    CSimpleStringA bin;//6 byte long
-    bool bIC;//IC:true or mag:false
-    bool bDC;//debit:true,credit:false
+	CSimpleStringA bin;//6 byte long
+	bool bIC;//IC:true or mag:false
+	bool bDC;//debit:true,credit:false
 };
 class CardAcceptEvent : public FSMEvent
 {
 public:
-    CardAcceptEvent() : FSMEvent(USER_EVT_ACCEPT) {}
-    ~CardAcceptEvent() {}
-    SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx;
-    virtual void OnUnhandled()
-    {
-        if (ctx != NULL) {
+	CardAcceptEvent() : FSMEvent(USER_EVT_ACCEPT){}
+	~CardAcceptEvent(){}
+	SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx;
+	virtual void OnUnhandled() 
+	{
+		if (ctx != NULL)
+		{
             DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("card accept unhandled");
-            ctx->Answer(Error_InvalidState);
-        }
-    }
+			ctx->Answer(Error_InvalidState);
+		}
+	}
 };
 
 class PreOnlineEvent : public FSMEvent
 {
 public:
-    PreOnlineEvent() : FSMEvent(USER_EVT_PREONLINE) {}
-    ~PreOnlineEvent() {}
-    SpReqAnsContext<ContactlessCardService_PreOnline_Req, ContactlessCardService_PreOnline_Ans>::Pointer ctx;
-    virtual void OnUnhandled()
-    {
-        if (ctx != NULL)
-            ctx->Answer(Error_InvalidState);
-    }
+	PreOnlineEvent() : FSMEvent(USER_EVT_PREONLINE){}
+	~PreOnlineEvent(){}
+	SpReqAnsContext<ContactlessCardService_PreOnline_Req,ContactlessCardService_PreOnline_Ans>::Pointer ctx;
+	virtual void OnUnhandled() 
+	{
+		if (ctx != NULL)
+			ctx->Answer(Error_InvalidState);
+	}
 protected:
 private:
 };
 class PostOnlineEvent : public FSMEvent
 {
 public:
-    PostOnlineEvent() : FSMEvent(USER_EVT_POSTONLINE) {}
-    ~PostOnlineEvent() {}
-    SpReqAnsContext<ContactlessCardService_PostOnline_Req, ContactlessCardService_PostOnline_Ans>::Pointer ctx;
-    virtual void OnUnhandled()
-    {
-        if (ctx != NULL)
-            ctx->Answer(Error_InvalidState);
-    }
+	PostOnlineEvent() : FSMEvent(USER_EVT_POSTONLINE){}
+	~PostOnlineEvent(){}
+	SpReqAnsContext<ContactlessCardService_PostOnline_Req,ContactlessCardService_PostOnline_Ans>::Pointer ctx;
+	virtual void OnUnhandled() 
+	{
+		if (ctx != NULL)
+			ctx->Answer(Error_InvalidState);
+	}
 protected:
 private:
 };
 class CardEjectEvent : public FSMEvent
 {
 public:
-    CardEjectEvent() : FSMEvent(USER_EVT_EJECT) {}
-    ~CardEjectEvent() {}
-    SpReqAnsContext<ContactlessCardService_Eject_Req, ContactlessCardService_Eject_Ans>::Pointer ctx;
-    virtual void OnUnhandled()
-    {
-        if (ctx != NULL)
-            ctx->Answer(Error_InvalidState);
-    }
+	CardEjectEvent() : FSMEvent(USER_EVT_EJECT){}
+	~CardEjectEvent(){}
+	SpReqAnsContext<ContactlessCardService_Eject_Req,ContactlessCardService_Eject_Ans>::Pointer ctx;
+	virtual void OnUnhandled() 
+	{
+		if (ctx != NULL)
+			ctx->Answer(Error_InvalidState);
+	}
 protected:
 private:
 };
 class ResetDeviceEvent : public FSMEvent
 {
 public:
-    ResetDeviceEvent() : FSMEvent(USER_EVT_RESET) {}
-    ~ResetDeviceEvent() {}
+	ResetDeviceEvent() : FSMEvent(USER_EVT_RESET){}
+	~ResetDeviceEvent(){}
 protected:
 private:
 };
 class ResetFinishedEvent : public FSMEvent
 {
 public:
-    ResetFinishedEvent() : FSMEvent(USER_EVT_RESETFINISHED) {}
-    ~ResetFinishedEvent() {}
+	ResetFinishedEvent() : FSMEvent(USER_EVT_RESETFINISHED){}
+	~ResetFinishedEvent(){}
 protected:
 private:
 };
 class QueryCardInfoEvent : public FSMEvent
 {
 public:
-    QueryCardInfoEvent() : FSMEvent(USER_EVT_QUERY_CARD_INFO) {}
-    ~QueryCardInfoEvent() {}
-    SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx;
-    virtual void OnUnhandled()
-    {
-        if (ctx != NULL)
-            ctx->Answer(Error_InvalidState);
-    }
+	QueryCardInfoEvent() : FSMEvent(USER_EVT_QUERY_CARD_INFO){}
+	~QueryCardInfoEvent(){}
+	SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req,ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx;
+	virtual void OnUnhandled() 
+	{
+		if (ctx != NULL)
+			ctx->Answer(Error_InvalidState);
+	}
 protected:
 private:
 };
 class CContactlessCardFSM : public CCommDevFSM<CContactlessCardFSM, RFICClass>
 {
 public:
-    enum { s0, s1, s2, s3, s4, s5, s6, s7, s8, s9 };
-    BEGIN_FSM_STATE(CContactlessCardFSM)
-        FSM_STATE_ENTRY(s0, "Init", s0_on_entry, s0_on_exit, s0_on_event)
-        FSM_STATE_ENTRY(s1, "Initializing", s1_on_entry, s1_on_exit, s1_on_event)
-        FSM_STATE_ENTRY(s2, "Idle", s2_on_entry, s2_on_exit, s2_on_event)
-        FSM_STATE_ENTRY(s3, "Accepting", s3_on_entry, s3_on_exit, s3_on_event)
-        FSM_STATE_ENTRY(s4, "Hold", s4_on_entry, s4_on_exit, s4_on_event)
-        FSM_STATE_ENTRY(s5, "Reading", s5_on_entry, s5_on_exit, s5_on_event)
-        FSM_STATE_ENTRY(s6, "Ejecting", s6_on_entry, s6_on_exit, s6_on_event)
-        FSM_STATE_ENTRY(s7, "WaitFetching", s7_on_entry, s7_on_exit, s7_on_event)
-        FSM_STATE_ENTRY(s8, "Capturing", s8_on_entry, s8_on_exit, s8_on_event)
-        FSM_STATE_ENTRY(s9, "Failed", s9_on_entry, s9_on_exit, s9_on_event)
-        END_FSM_STATE()
-
-        BEGIN_FSM_RULE(CContactlessCardFSM, s0)
-
-        FSM_RULE_ENTRY(s0, s1, USER_EVT_INIT, 0)
-        FSM_RULE_ENTRY(s0, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s1, s2, USER_EVT_INITFINISHED, 0)
-        FSM_RULE_ENTRY(s1, s9, USER_EVT_INITFINISHED, 1)
-        FSM_RULE_ENTRY(s1, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s2, s3, USER_EVT_ACCEPT, 0)
-        FSM_RULE_ENTRY(s2, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-        FSM_RULE_ENTRY(s2, s6, USER_EVT_EJECT, 0)
-
-        FSM_RULE_ENTRY(s3, s4, USER_EVT_ACCEPTFINISHED, 0)
-        FSM_RULE_ENTRY(s3, s9, USER_EVT_ACCEPTFINISHED, 1)
-        FSM_RULE_ENTRY(s3, s2, USER_EVT_ACCEPTFINISHED, 2)
-        FSM_RULE_ENTRY(s3, s2, USER_EVT_ACCEPTFINISHED, 3)
-        FSM_RULE_ENTRY(s3, s7, USER_EVT_ACCEPTFINISHED, 4)
-        FSM_RULE_ENTRY(s3, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s4, s6, USER_EVT_EJECT, 0)
-        FSM_RULE_ENTRY(s4, s6, USER_EVT_EXIT, 0)
-        FSM_RULE_ENTRY(s4, s2, USER_EVT_QUERY_CARD_INFO_FINISHED, 0)
-        FSM_RULE_ENTRY(s4, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s5, s4, USER_EVT_READ_FINISHED, 0)
-        FSM_RULE_ENTRY(s5, s9, USER_EVT_READ_FINISHED, 1)
-        FSM_RULE_ENTRY(s5, s2, USER_EVT_READ_FINISHED, 2)
-        FSM_RULE_ENTRY(s5, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-        FSM_RULE_ENTRY(s5, s6, USER_EVT_EXIT, 0)
-
-        FSM_RULE_ENTRY(s6, s7, USER_EVT_EJECTFINISHED, 1)
-        FSM_RULE_ENTRY(s6, s7, USER_EVT_EJECTFINISHED, 0)
-        FSM_RULE_ENTRY(s6, s7, USER_EVT_EJECTFINISHED, 2)
-        FSM_RULE_ENTRY(s6, s2, USER_EVT_EXIT, 0)
-        FSM_RULE_ENTRY(s6, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s7, s2, USER_EVT_WAITFINISHED, 0)
-        FSM_RULE_ENTRY(s7, s2, USER_EVT_WAITFINISHED, 2)
-        FSM_RULE_ENTRY(s7, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s8, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
-        FSM_RULE_ENTRY(s9, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-        FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 0)
-        FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 1)
-        END_FSM_RULE()
-
-        CContactlessCardFSM() : m_pRFIC(NULL), m_bCancelAccept(false), m_bWaitingAccept(false),
-        m_bWaitAccepteMore(false), m_bExit(false), m_resetTimes(0), m_testResult(Error_Succeed)
-        //,m_pTACReject(NULL),m_pIACOnline(NULL),m_pTACOnline(NULL),m_pIACDefault(NULL),m_pTACDefault(NULL)
-        , m_bCDA(false), m_pDataToARQC(NULL), m_bSM(false), m_bOnlineOnly(false), m_port(true), m_Baudrate(true)
-		, m_csDevNo(true), m_devInit(false), m_repeatErrTimes(0)
-    {
-		HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x213);
-		m_FirstStart = TRUE;
-		m_aidList.Init(3);
-		m_aidList[0] = "A000000333";
-		m_aidList[1] = "A0000000108888";
-		m_aidList[2] = "A000000790";
-		ZeroMemory(&m_adapterInfo, sizeof(m_adapterInfo));
-    }
-    ~CContactlessCardFSM() {}
-    virtual ErrorCodeEnum OnInit();
-    virtual ErrorCodeEnum OnExit();
-
-    void s0_on_entry();
-    void s0_on_exit();
-    unsigned int s0_on_event(FSMEvent* event);
-    void s1_on_entry();
-    void s1_on_exit();
-    unsigned int s1_on_event(FSMEvent* event);
-    void s2_on_entry();
-    void s2_on_exit();
-    unsigned int s2_on_event(FSMEvent* event);
-    void s3_on_entry();
-    void s3_on_exit();
-    unsigned int s3_on_event(FSMEvent* event);
-    void s4_on_entry();
-    void s4_on_exit();
-    unsigned int s4_on_event(FSMEvent* event);
-    void s5_on_entry();
-    void s5_on_exit();
-    unsigned int s5_on_event(FSMEvent* event);
-    void s6_on_entry();
-    void s6_on_exit();
-    unsigned int s6_on_event(FSMEvent* event);
-    void s7_on_entry();
-    void s7_on_exit();
-    unsigned int s7_on_event(FSMEvent* event);
-    void s8_on_entry();
-    void s8_on_exit();
-    unsigned int s8_on_event(FSMEvent* event);
-    void s9_on_entry();
-    void s9_on_exit();
-    unsigned int s9_on_event(FSMEvent* event);
-
-    int Initial();
-    ErrorCodeEnum Load();
-    bool GetDevStatus();
-    int InternalAcceptCard();
-    int AcceptCard(SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx);
-    //int ReadCard(SpReqAnsContext<ContactlessCardService_Read_Req,ContactlessCardService_Read_Ans>::Pointer ctx);
-    int PreOnline(SpReqAnsContext<ContactlessCardService_PreOnline_Req, ContactlessCardService_PreOnline_Ans>::Pointer ctx);
-    int PostOnline(SpReqAnsContext<ContactlessCardService_PostOnline_Req, ContactlessCardService_PostOnline_Ans>::Pointer ctx);
-    int EjectCard(SpReqAnsContext<ContactlessCardService_Eject_Req, ContactlessCardService_Eject_Ans>::Pointer ctx);
-    int Reset();
-    int WaitFetchingCard();
-    int QueryCardInfo(SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx);
-    bool GetWaitFlag() { return m_bWaitingAccept; }
-    void SetWaitMore() { m_bWaitAccepteMore = true; }
-    void SetExitFlag(bool bFlag = true) { m_bExit = bFlag; }
-	bool GetDevInitFlag() { return m_devInit; }
-
-    void SelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext)
-    {
-        pTransactionContext->SendAnswer(m_testResult);
-    }
-    DevStateEnum GetDevState() { return m_eDevState; }
-
-	ErrorCodeEnum AnswerErrCode(const ErrorCodeEnum& ec)
-	{
-		ErrorCodeEnum result(ec);
-		if (ec == Error_Succeed) {
-
-		}
-		else if (!m_devInit) {
-			result = Error_DevNotAvailable;
+	enum {s0,s1,s2,s3,s4,s5,s6,s7,s8,s9};
+	BEGIN_FSM_STATE(CContactlessCardFSM)
+		FSM_STATE_ENTRY(s0,"Init",s0_on_entry,s0_on_exit,s0_on_event)
+		FSM_STATE_ENTRY(s1,"Initializing",s1_on_entry,s1_on_exit,s1_on_event)
+		FSM_STATE_ENTRY(s2,"Idle",s2_on_entry,s2_on_exit,s2_on_event)
+		FSM_STATE_ENTRY(s3,"Accepting",s3_on_entry,s3_on_exit,s3_on_event)
+		FSM_STATE_ENTRY(s4,"Hold",s4_on_entry,s4_on_exit,s4_on_event)
+		FSM_STATE_ENTRY(s5,"Reading",s5_on_entry,s5_on_exit,s5_on_event)
+		FSM_STATE_ENTRY(s6,"Ejecting",s6_on_entry,s6_on_exit,s6_on_event)
+		FSM_STATE_ENTRY(s7,"WaitFetching",s7_on_entry,s7_on_exit,s7_on_event)
+		FSM_STATE_ENTRY(s8,"Capturing",s8_on_entry,s8_on_exit,s8_on_event)
+		FSM_STATE_ENTRY(s9,"Failed",s9_on_entry,s9_on_exit,s9_on_event)
+		END_FSM_STATE()
+
+		BEGIN_FSM_RULE(CContactlessCardFSM,s0)
+		FSM_RULE_ENTRY(s0,s1,USER_EVT_INIT,0)
+		FSM_RULE_ENTRY(s0, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s1,s2,USER_EVT_INITFINISHED,0)
+		FSM_RULE_ENTRY(s1,s9,USER_EVT_INITFINISHED,1)
+		FSM_RULE_ENTRY(s1, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s2,s3,USER_EVT_ACCEPT,0)
+		//		FSM_RULE_ENTRY(s2,s9,USER_EVT_ACCEPT,1)
+		FSM_RULE_ENTRY(s2, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s2, s6, USER_EVT_EJECT, 0)
+		FSM_RULE_ENTRY(s3,s4,USER_EVT_ACCEPTFINISHED,0)
+		FSM_RULE_ENTRY(s3,s9,USER_EVT_ACCEPTFINISHED,1)
+		FSM_RULE_ENTRY(s3,s2,USER_EVT_ACCEPTFINISHED,2)
+		FSM_RULE_ENTRY(s3,s2,USER_EVT_ACCEPTFINISHED,3)
+		FSM_RULE_ENTRY(s3,s7,USER_EVT_ACCEPTFINISHED,4)
+		FSM_RULE_ENTRY(s3, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		//FSM_RULE_ENTRY(s4,s5,USER_EVT_READ,0)
+		//FSM_RULE_ENTRY(s4,s5,USER_EVT_READ,0)
+		FSM_RULE_ENTRY(s4,s6,USER_EVT_EJECT,0)
+		FSM_RULE_ENTRY(s4,s6,USER_EVT_EXIT,0)
+		//FSM_RULE_ENTRY(s4,s2,USER_EVT_ACCEPT,0)
+		FSM_RULE_ENTRY(s4,s2,USER_EVT_QUERY_CARD_INFO_FINISHED,0)
+		FSM_RULE_ENTRY(s4, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s5,s4,USER_EVT_READ_FINISHED,0)
+		FSM_RULE_ENTRY(s5,s9,USER_EVT_READ_FINISHED,1)
+		FSM_RULE_ENTRY(s5,s2,USER_EVT_READ_FINISHED,2)
+		FSM_RULE_ENTRY(s5, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s5, s6, USER_EVT_EXIT, 0)
+		FSM_RULE_ENTRY(s6,s7,USER_EVT_EJECTFINISHED,1)
+		FSM_RULE_ENTRY(s6,s7,USER_EVT_EJECTFINISHED,0)
+		FSM_RULE_ENTRY(s6,s7,USER_EVT_EJECTFINISHED,2)
+		FSM_RULE_ENTRY(s6,s2,USER_EVT_EXIT,0)
+		FSM_RULE_ENTRY(s6, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s7,s2,USER_EVT_WAITFINISHED,0)
+		FSM_RULE_ENTRY(s7,s2,USER_EVT_WAITFINISHED,2)
+		//FSM_RULE_ENTRY(s7,s9,USER_EVT_WAITFINISHED,1)
+		//FSM_RULE_ENTRY(s7,s8,USER_EVT_WAITFINISHED,2)
+		FSM_RULE_ENTRY(s7, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		//FSM_RULE_ENTRY(s8,s2,USER_EVT_CAPTUREFINISHED,0)
+		//FSM_RULE_ENTRY(s8,s9,USER_EVT_CAPTUREFINISHED,1)
+		FSM_RULE_ENTRY(s8, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		//FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 0)
+		FSM_RULE_ENTRY(s9, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
+		FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 0)
+		FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 1)
+		END_FSM_RULE()
+
+		CContactlessCardFSM() : m_bCancelAccept(false),m_bWaitingAccept(false),
+		m_bWaitAccepteMore(false),m_bExit(false),m_resetTimes(0),m_testResult(Error_Succeed)
+		,m_bCDA(false),m_pDataToARQC(NULL), m_csMachineType(true), m_csDevNo(""),m_devInit(false), m_repeatErrTimes(0)
+		{
+			HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x213); 
+			m_aidList.Init(3);
+			m_aidList[0] = "A000000333";
+			m_aidList[1] = "A0000000108888";
+			m_aidList[2] = "A000000790";	
 		}
-		else if (0 < DeviceBaseHelper::CountDevError(GetEntityBase()->GetFunction(), m_repeatErrTimes)) {
-			result = Error_DevFailAddUp;
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("exceed max allow repeat error times! 0x%x -> 0x%x", ec, result);
-		}
-		return result;
+	~CContactlessCardFSM(){}
+	virtual ErrorCodeEnum OnInit();
+	virtual ErrorCodeEnum OnExit();
+
+	void s0_on_entry();
+	void s0_on_exit();
+	unsigned int s0_on_event(FSMEvent* event);
+	void s1_on_entry();
+	void s1_on_exit();
+	unsigned int s1_on_event(FSMEvent* event);
+	void s2_on_entry();
+	void s2_on_exit();
+	unsigned int s2_on_event(FSMEvent* event);
+	void s3_on_entry();
+	void s3_on_exit();
+	unsigned int s3_on_event(FSMEvent* event);
+	void s4_on_entry();
+	void s4_on_exit();
+	unsigned int s4_on_event(FSMEvent* event);
+	void s5_on_entry();
+	void s5_on_exit();
+	unsigned int s5_on_event(FSMEvent* event);
+	void s6_on_entry();
+	void s6_on_exit();
+	unsigned int s6_on_event(FSMEvent* event);
+	void s7_on_entry();
+	void s7_on_exit();
+	unsigned int s7_on_event(FSMEvent* event);
+	void s8_on_entry();
+	void s8_on_exit();
+	unsigned int s8_on_event(FSMEvent* event);
+	void s9_on_entry();
+	void s9_on_exit();
+	unsigned int s9_on_event(FSMEvent* event);
+
+	int Initial();
+	ErrorCodeEnum Load();
+	bool GetDevStatus(bool bPrint=true);
+	int InternalAcceptCard();
+	int AcceptCard(SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx);
+	//int ReadCard(SpReqAnsContext<ContactlessCardService_Read_Req,ContactlessCardService_Read_Ans>::Pointer ctx);
+	int PreOnline(SpReqAnsContext<ContactlessCardService_PreOnline_Req,ContactlessCardService_PreOnline_Ans>::Pointer ctx);
+	int PostOnline(SpReqAnsContext<ContactlessCardService_PostOnline_Req,ContactlessCardService_PostOnline_Ans>::Pointer ctx);
+	int EjectCard(SpReqAnsContext<ContactlessCardService_Eject_Req,ContactlessCardService_Eject_Ans>::Pointer ctx);
+	int Reset();
+	int WaitFetchingCard();
+	int QueryCardInfo(SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx);
+	bool GetWaitFlag(){return m_bWaitingAccept;}
+	void SetWaitMore(){m_bWaitAccepteMore = true;}
+	void SetExitFlag(bool bFlag=true){m_bExit = bFlag;}
+	bool GetDevInitFlag() { return m_bOpened; }
+	void ToLogWarnInfoAboutTermCustom();
+
+	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext)
+	{
+		pTransactionContext->SendAnswer(m_testResult);
 	}
+	DevStateEnum GetDevState(){ return m_eDevState;}
 
 protected:
-    int m_iInsertTries;
-    int m_resetTries;
-    int m_ejectTries;
+	int m_iInsertTries;
+	int m_resetTries;
+	int m_ejectTries;
 private:
-    int m_resetTimes;
-    lpCMBdecodeMag2 cmdDecodeMag2;
-    lpCMBdecodeEx cmdDecodeEx;
-
-    bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit, m_bIssued, m_bSM;
-    ErrorCodeEnum m_testResult;
+	///
+	int m_resetTimes;
+	lpCMBdecodeMag2 cmdDecodeMag2;
+	lpCMBdecodeEx cmdDecodeEx;	
+	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit, m_bIssued;
+	ErrorCodeEnum m_testResult;
+	CSimpleStringA m_csMachineType;
+	DevCategoryInfo m_devCatInfo;
 
-    int m_CardInit, m_CardRemains, m_CardIssued, m_CardCaptured, m_CardMixed, m_CardPercent;
-    RFICReaderStatus devStatus;
-    RFICClass* m_pRFIC;
-    DevStateEnum m_eDevState;
-    CCardProcess* m_pCardProcess;
-    char* m_pDataToARQC;
-    long xxTest;
+	int m_CardInit,m_CardRemains,m_CardIssued,m_CardCaptured,m_CardMixed,m_CardPercent;
+	RFICReaderStatus devStatus;
+	DevStateEnum m_eDevState;
+	CCardProcess *m_pCardProcess;
+	char *m_pDataToARQC;
+	long xxTest;
 	CAutoArray<CSimpleStringA> m_aidList;
 
-	DevCategoryInfo m_devCatInfo;
-	CSimpleStringA m_port, m_Baudrate;
-
+	char m_AuthCode[2];
+	bool m_bCDA;
 	CSimpleStringA m_csDevNo;
-	int m_repeatErrTimes;
 
-    char m_AuthCode[2];
-    bool m_bOnlineOnly, m_bCDA;
+	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);
 
-    int SplitTrack2(CSimpleStringA pTrack2, Track2Data& decodeData);
+	int m_repeatErrTimes;
 };
 struct InitTask : public ITaskSp
 {
-    CContactlessCardFSM* fsm;
+	CContactlessCardFSM* fsm;
 
-    InitTask(CContactlessCardFSM* f) : fsm(f) {}
+	InitTask(CContactlessCardFSM* f) : fsm(f) {}
 
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_INITFINISHED);
-        e->param1 = fsm->Initial();
-        fsm->PostEventFIFO(e);
-    }
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_INITFINISHED);
+		e->param1 = fsm->Initial();
+		fsm->PostEventFIFO(e);
+	}
 };
 struct AcceptTask : public ITaskSp
 {
-    CContactlessCardFSM* fsm;
-    SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx;
-    AcceptTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        LOG_FUNCTION();
-        FSMEvent* e = new FSMEvent(USER_EVT_ACCEPTFINISHED);
-        e->param1 = fsm->AcceptCard(ctx);
-        fsm->PostEventFIFO(e);
-    }
+	CContactlessCardFSM* fsm;
+	SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx;
+	AcceptTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		LOG_FUNCTION();
+		FSMEvent *e = new FSMEvent(USER_EVT_ACCEPTFINISHED);
+		e->param1 = fsm->AcceptCard(ctx);
+		fsm->PostEventFIFO(e);
+	}
 };
 
 struct PreOnlineTask : public ITaskSp
 {
-    SpReqAnsContext<ContactlessCardService_PreOnline_Req, ContactlessCardService_PreOnline_Ans>::Pointer ctx;
-    CContactlessCardFSM* fsm;
-    PreOnlineTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_PREONLINEFINISHED);
-        e->param1 = fsm->PreOnline(ctx);
-        fsm->PostEventFIFO(e);
-    }
+	SpReqAnsContext<ContactlessCardService_PreOnline_Req,ContactlessCardService_PreOnline_Ans>::Pointer ctx;
+	CContactlessCardFSM* fsm;
+	PreOnlineTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_PREONLINEFINISHED);
+		e->param1 = fsm->PreOnline(ctx);
+		fsm->PostEventFIFO(e);
+	}
 };
 struct PostOnlineTask : public ITaskSp
 {
-    SpReqAnsContext<ContactlessCardService_PostOnline_Req, ContactlessCardService_PostOnline_Ans>::Pointer ctx;
-    CContactlessCardFSM* fsm;
-    PostOnlineTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_POSTONLINEFINISHED);
-        e->param1 = fsm->PostOnline(ctx);
-        fsm->PostEventFIFO(e);
-    }
+	SpReqAnsContext<ContactlessCardService_PostOnline_Req,ContactlessCardService_PostOnline_Ans>::Pointer ctx;
+	CContactlessCardFSM* fsm;
+	PostOnlineTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_POSTONLINEFINISHED);
+		e->param1 = fsm->PostOnline(ctx);
+		fsm->PostEventFIFO(e);
+	}
 };
 struct EjectTask : public ITaskSp
 {
-    SpReqAnsContext<ContactlessCardService_Eject_Req, ContactlessCardService_Eject_Ans>::Pointer ctx;
-    CContactlessCardFSM* fsm;
-    EjectTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_EJECTFINISHED);
-        e->param1 = fsm->EjectCard(ctx);
-        fsm->PostEventFIFO(e);
-    }
+	SpReqAnsContext<ContactlessCardService_Eject_Req,ContactlessCardService_Eject_Ans>::Pointer ctx;
+	CContactlessCardFSM* fsm;
+	EjectTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_EJECTFINISHED);
+		e->param1 = fsm->EjectCard(ctx);
+		fsm->PostEventFIFO(e);
+	}
 };
 struct WaitFetchingTask : public ITaskSp
 {
-    CContactlessCardFSM* fsm;
-    WaitFetchingTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_WAITFINISHED);
-        e->param1 = fsm->WaitFetchingCard();
-        fsm->PostEventFIFO(e);
-    }
+	CContactlessCardFSM* fsm;
+	WaitFetchingTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_WAITFINISHED);
+		e->param1 = fsm->WaitFetchingCard();
+		fsm->PostEventFIFO(e);
+	}
 };
 struct ResetTask : public ITaskSp
 {
-    CContactlessCardFSM* fsm;
-    ResetTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        ResetFinishedEvent* e = new ResetFinishedEvent();
-        e->param1 = fsm->Reset();
-        fsm->PostEventFIFO(e);
-    }
+	CContactlessCardFSM* fsm;
+	ResetTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		ResetFinishedEvent *e = new ResetFinishedEvent();
+		e->param1 = fsm->Reset();
+		fsm->PostEventFIFO(e);
+	}
 };
 struct QueryCardInfoTask : public ITaskSp
 {
-    SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx;
-    CContactlessCardFSM* fsm;
-    QueryCardInfoTask(CContactlessCardFSM* f) : fsm(f) {}
-    void Process()
-    {
-        FSMEvent* e = new FSMEvent(USER_EVT_QUERY_CARD_INFO_FINISHED);
-        e->param1 = fsm->QueryCardInfo(ctx);
-        fsm->PostEventFIFO(e);
-    }
+	SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req,ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx;
+	CContactlessCardFSM* fsm;
+	QueryCardInfoTask(CContactlessCardFSM* f) : fsm(f) {}
+	void Process()
+	{
+		FSMEvent *e = new FSMEvent(USER_EVT_QUERY_CARD_INFO_FINISHED);
+		e->param1 = fsm->QueryCardInfo(ctx);
+		fsm->PostEventFIFO(e);
+	}
 };
 #endif //_CONTACTLESS_FSM_H

Module/mod_ContactlessCard/mod_ContactlessCard.cpp

@@ -9,64 +9,58 @@ bool bCard = false;
 void ContactlessCardServerSession::Handle_Insert(SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("Insert")("Invoke Insert");
 	m_pEntity->Insert(ctx);
 }
 void ContactlessCardServerSession::Handle_CancelInsert(SpOnewayCallContext<ContactlessCardService_CancelInsert_Info>::Pointer ctx)
 {
 	LOG_FUNCTION();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("CancelInsert")("Invoke CancelInsert");
 	m_pEntity->CancelInsert(ctx);
 }
 void ContactlessCardServerSession::Handle_InsertWaitMore(SpOnewayCallContext<ContactlessCardService_InsertWaitMore_Info>::Pointer ctx)
 {
 	LOG_FUNCTION();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("InsertWaitMore")("Invoke InsertWaitMore");
 	m_pEntity->InsertWaitMore(ctx);
 }
 void ContactlessCardServerSession::Handle_PreOnline(SpReqAnsContext<ContactlessCardService_PreOnline_Req, ContactlessCardService_PreOnline_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	//ctx->Ans.result = "ACTION,|ATCCODE,000C|ARQCCODE,586EFDCCD5385856|MAC,07010103A0B000010A01000000000075EB2B20|ARQCSIZE,37|ARQCDATA,00000000000000000000000001560000000000015614102270046E69797C00000C03A0B000|EXPIREDATE,240731|T2ACCOUNT,6214838818741003|T2CARDSERIAL,0|T2CVC,838125|T2TRACK2,6214838818741003D24072202453300838125|CARDCAT,0";
-	//ctx->Answer(Error_Succeed);
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("PreOnline")("Invoke PreOnline");
 	m_pEntity->PreOnline(ctx);
 }
 
 void ContactlessCardServerSession::Handle_PostOnline(SpReqAnsContext<ContactlessCardService_PostOnline_Req, ContactlessCardService_PostOnline_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	//ctx->Ans.result = "";
-	//ctx->Answer(Error_Succeed);
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("PostOnline")("Invoke PostOnline");
 	m_pEntity->PostOnline(ctx);
 }
 
 void ContactlessCardServerSession::Handle_Eject(SpReqAnsContext<ContactlessCardService_Eject_Req, ContactlessCardService_Eject_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	//bCard = false;
-	//ctx->Answer(Error_Succeed);
-	//FetchCard evt;
-	//evt.status = 0;
-	//SpSendBroadcast(m_pEntity->GetFunction(),SP_MSG_OF(FetchCard),SP_MSG_SIG_OF(FetchCard),evt);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("客户取走卡片msg发送");
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("Eject")("Invoke Eject");
 	m_pEntity->Eject(ctx);
 }
 
 void ContactlessCardServerSession::Handle_Exit(SpOnewayCallContext<ContactlessCardService_Exit_Info>::Pointer ctx)
 {
 	LOG_FUNCTION();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("Exit")("Invoke Exit");
 	m_pEntity->Exit(ctx);
 }
 void ContactlessCardServerSession::Handle_QueryCardInfo(SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	//if (bCard)
-	//	ctx->Ans.position = 4;
-	//else
-	//	ctx->Ans.position = 0;
-	//ctx->Answer(Error_Succeed);
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("QueryCardInfo")("Invoke QueryCardInfo");
 	m_pEntity->QueryCardInfo(ctx);
 }
 void ContactlessCardServerSession::Handle_GetDevInfo(SpReqAnsContext<ContactlessCardService_GetDevInfo_Req, ContactlessCardService_GetDevInfo_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI("GetDevInfo")("Invoke GetDevInfo");
 	m_pEntity->GetDevInfo(ctx);
 }
 

Module/mod_ContactlessCard/mod_ContactlessCard.h

@@ -3,8 +3,8 @@
 #pragma once
 #include "stdafx.h"
 #include "ContactlessFSM.h"
+#include "DevEntityCommBase.hpp"
 #include "modVer.h"
-#include "SpTest.h"
 
 class CContactlessCardEntity;
 
@@ -34,20 +34,12 @@ public:
 	}
 	virtual ~CContactlessCardEntity(){}
 	virtual const char *GetEntityName() const { return "ContactlessCard"; }
-	virtual const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
-
-	ON_ENTITYT_TEST()
-
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 	{ 
 		LOG_FUNCTION();
-		//MessageBoxA(0,0,0,0);
-		ErrorCodeEnum eStart = m_fsm.Init(this);
-		if (eStart == Error_Succeed)
-		{
-		}
 
-		pTransactionContext->SendAnswer(eStart);
+		ErrorCodeEnum eStart = m_fsm.Init(this);
+		pTransactionContext->SendAnswer(Error_Succeed);
 	}
 
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext) 
@@ -77,11 +69,11 @@ public:
 	void Insert(SpReqAnsContext<ContactlessCardService_Insert_Req, ContactlessCardService_Insert_Ans>::Pointer ctx)
 	{
 		LOG_FUNCTION();
-		if (!m_fsm.GetDevInitFlag()) {
-			ctx->Answer(Error_DevNotAvailable);
+		if(!m_fsm.GetDevInitFlag()){
+			ctx->Answer(Error_DevNotAvailable, ContactlessCard_UserErrorCode_Read_OpenFailed);
 			LogWarn(Severity_Middle, Error_DevNotAvailable, ContactlessCard_UserErrorCode_Read_OpenFailed, "ReadCard but DevOpen failed.");
 		}
-		else {
+		else{
 			m_fsm.SetExitFlag(false);
 			CardAcceptEvent* e = new CardAcceptEvent();
 			e->ctx = ctx;
@@ -92,8 +84,12 @@ public:
 	void CancelInsert(SpOnewayCallContext<ContactlessCardService_CancelInsert_Info>::Pointer ctx)
 	{
 		LOG_FUNCTION();
-		FSMEvent *evt = new FSMEvent(USER_EVT_ACCEPT_CANCEL);
-		m_fsm.PostEventFIFO(evt);
+		if(!m_fsm.GetDevInitFlag()){
+			LogWarn(Severity_Middle, Error_DevNotAvailable, ContactlessCard_UserErrorCode_Cancel_OpenFailed, "CancelInsert but DevOpen failed.");
+		}else{
+			FSMEvent *evt = new FSMEvent(USER_EVT_ACCEPT_CANCEL);
+			m_fsm.PostEventFIFO(evt);
+		}
 	}
 	void InsertWaitMore(SpOnewayCallContext<ContactlessCardService_InsertWaitMore_Info>::Pointer ctx)
 	{
@@ -127,8 +123,12 @@ public:
 	void Exit(SpOnewayCallContext<ContactlessCardService_Exit_Info>::Pointer ctx)
 	{
 		LOG_FUNCTION();
-		FSMEvent *evt = new FSMEvent(USER_EVT_EXIT);
-		m_fsm.PostEventFIFO(evt);
+		if(!m_fsm.GetDevInitFlag()){
+			LogWarn(Severity_Middle, Error_DevNotAvailable, ContactlessCard_UserErrorCode_Exit_OpenFailed, "Exit but DevOpen failed.");
+		}else{
+			FSMEvent *evt = new FSMEvent(USER_EVT_EXIT);
+			m_fsm.PostEventFIFO(evt);
+		}
 	}
 
 	void QueryCardInfo(SpReqAnsContext<ContactlessCardService_QueryCardInfo_Req, ContactlessCardService_QueryCardInfo_Ans>::Pointer ctx)