Z991239-6033 #comment feat: 非接js接口优化

Signed-Off-By: commit-hook

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -1638,7 +1638,7 @@ void CContactlessCardFSM::GetCardProcessLastErr(ErrorCodeEnum& eErrCode, CSimple
 
 DWORD CContactlessCardFSM::GetFsmStateErrCode()
 {
-	int state = GetCurrState()->id;
+	int state = GetFSMState();
 	switch (state)
 	{
 	case 2:

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -358,7 +358,7 @@ public:
 	//new interface
 	int GetFSMState()
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_currentFSMState:%d", m_currentFSMState);
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_currentFSMState:%d", m_currentFSMState);
 		return m_currentFSMState;
 	}
 	DWORD GetFsmStateErrCode();

Module/mod_ContactlessCard/mod_ContactlessCard.h

@@ -191,8 +191,7 @@ public:
 		}
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
-			//int state = m_fsm.GetFSMState();
-			int state = m_fsm.GetCurrState()->id;
+			int state = m_fsm.GetFSMState();
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
@@ -211,8 +210,7 @@ public:
 		}
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
-			//int state = m_fsm.GetFSMState();
-			int state = m_fsm.GetCurrState()->id;
+			int state = m_fsm.GetFSMState();
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PostOnlineJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
@@ -231,8 +229,7 @@ public:
 		}
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
-			//int state = m_fsm.GetFSMState();
-			int state = m_fsm.GetCurrState()->id;
+			int state = m_fsm.GetFSMState();
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}