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

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -499,7 +499,7 @@ unsigned int CCardIssuerFSM::s4_on_event(FSMEvent* pEvt)
 				pEvt->SetHandled();
 				return 0;
 			}
-		case USER_EVT_EXIT_MIAN_PAGE:
+		case EVT_MAINPAGE_DISPLAY:
 			{
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("S4 receive exit to main page");
 				m_captureReason = "4001";
@@ -8729,14 +8729,6 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStoreService_ReadJS_Req, Ca
 	}
 }
 
-int CCardIssuerFSM::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;
-}
-
 DWORD CCardIssuerFSM::GetFsmStateErrCode()
 {
 	int state = GetFSMState();

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -92,7 +92,6 @@ enum EvtType
 	USER_EVT_JS_ADD_CRAD_FROMBOX_FINISHED,
 	USER_EVT_JS_MOVE_CARD_FROMSLOT,
 	USER_EVT_JS_MOVE_CARD_FROMSLOT_FINISHED,
-	USER_EVT_EXIT_MIAN_PAGE,
 };
 enum SAMICCommandType
 {
@@ -1085,7 +1084,7 @@ public:
 		FSM_RULE_ENTRY(s4, s18, USER_EVT_JS_PRINT_CARD, 0)//JS 打印
 		FSM_RULE_ENTRY(s4, s5, USER_EVT_JS_POSTONLINE, 0)//JS 联机后处理
 		FSM_RULE_ENTRY(s4, s5, USER_EVT_JS_READ, 0)//JS 读卡
-		FSM_RULE_ENTRY(s4, s8, USER_EVT_EXIT_MIAN_PAGE, 1)//退到首页事件
+		FSM_RULE_ENTRY(s4, s8, EVT_MAINPAGE_DISPLAY, 1)//退到首页事件
 		FSM_RULE_ENTRY(s5,s4,USER_EVT_READ_FINISHED,0)
 		FSM_RULE_ENTRY(s5,s9,USER_EVT_READ_FINISHED,1)
 		FSM_RULE_ENTRY(s5,s4,USER_EVT_READ_FINISHED,2)
@@ -1460,7 +1459,6 @@ public:
 
 	int ReadJS(SpReqAnsContext<CardIssuerStoreService_ReadJS_Req, CardIssuerStoreService_ReadJS_Ans>::Pointer ctx);
 
-	int ExitToMainPage();
 #pragma endregion JS接口具体实现方法
 
 #pragma region JS新增接口

Module/mod_cardissuerstore/mod_cardissuer.cpp

@@ -333,8 +333,6 @@ void CCardIssuerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue,
 		m_fsm.OnUIState4SetWhatPage(pszValue);
 		if (_strnicmp(pszValue, "M", strlen("M")) == 0) {
 			m_fsm.SetEnterMainPage();//设置进入首页
-			//判断是否进入首页触发业务结束事件，发送事件给状态机。
-			m_fsm.ExitToMainPage();
 		}
 	}
 }