Z991239-6139 #comment feat: 非接使用框架提供的退出事件

Signed-Off-By: commit-hook

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -586,7 +586,7 @@ unsigned int CContactlessCardFSM::s10_on_event(FSMEvent* pEvt)
 			ret = 0;
 		}
 	break;
-	case USER_EVT_EXIT_MIAN_PAGE:
+	case EVT_MAINPAGE_DISPLAY:
 		{
 			m_bPageExit = true;
 			pEvt->SetHandled();
@@ -622,7 +622,7 @@ unsigned int CContactlessCardFSM::s11_on_event(FSMEvent* pEvt)
 			ret = pEvt->param1;
 		}
 	break;
-	case USER_EVT_EXIT_MIAN_PAGE:
+	case EVT_MAINPAGE_DISPLAY:
 	{
 		m_bPageExit = true;
 		pEvt->SetHandled();
@@ -2197,11 +2197,3 @@ int CContactlessCardFSM::PreOnlineJS(SpReqAnsContext<ContactlessCardService_Read
 	return 0;
 
 }
-
-int CContactlessCardFSM::ExitToMainPage()
-{
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("exit to main page, send event");
-	FSMEvent* evt = new FSMEvent(USER_EVT_EXIT_MIAN_PAGE);
-	PostEventFIFO(evt);
-	return 0;
-}

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -45,8 +45,7 @@ enum EvtType
 	USER_EVT_JS_EJECTFINISHED,
 	USER_EVT_JS_POSTONLINE,
 	USER_EVT_JS_POSTONLINEFINISHED,
-	USER_EVT_JS_READ_CANCEL,
-	USER_EVT_EXIT_MIAN_PAGE
+	USER_EVT_JS_READ_CANCEL
 };
 
 using namespace ContactlessCard;
@@ -374,8 +373,6 @@ public:
 
 	int PreOnlineJS(SpReqAnsContext<ContactlessCardService_ReadJS_Req, ContactlessCardService_ReadJS_Ans>::Pointer ctx);
 
-	int ExitToMainPage();
-
 protected:
 	int m_iInsertTries;
 	int m_resetTries;

Module/mod_ContactlessCard/mod_ContactlessCard.cpp

@@ -117,9 +117,6 @@ void CContactlessCardEntity::OnSysVarEvent(const char* pszKey, const char* pszVa
 	if ((_strnicmp(pszKey, "UIState", strlen("UIState")) == 0))
 	{
 		m_fsm.OnUIState4SetWhatPage(pszValue);
-		if (_strnicmp(pszValue, "M", strlen("M")) == 0) {
-			m_fsm.ExitToMainPage();
-		}
 	}
 }