Z991239-5363 #comment 去除卡机卡库中用户自定义状态

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -148,7 +148,7 @@ void CCardIssuerFSM::s2_on_entry()
 	LOG_FUNCTION();
 	ToLogWarnInfoAboutTermCustom();
 	m_currentFSMState = 2;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
 	SetDevStateAndSendMsg(DEVICE_STATUS_NORMAL, false);
 	
 	m_resetTimes = 0;
@@ -420,7 +420,7 @@ void CCardIssuerFSM::s4_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 4;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
 }
 void CCardIssuerFSM::s4_on_exit()
 {
@@ -686,7 +686,7 @@ void CCardIssuerFSM::s5_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 5;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_READING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_READING);
 }
 void CCardIssuerFSM::s5_on_exit()
 {
@@ -776,7 +776,7 @@ void CCardIssuerFSM::s7_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 7;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_WAITFETCHING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_WAITFETCHING);
 	WaitFetchingTask* task = new WaitFetchingTask(this);
 	GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 }
@@ -993,7 +993,7 @@ void CCardIssuerFSM::s9_on_entry()
 	LOG_FUNCTION();
 	m_currentFSMState = 9;
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer in fault state, need to reset.");
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDSWIPER_FAILED);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDSWIPER_FAILED);
 	SetDevStateAndSendMsg(DEVICE_STATUS_FAULT);
 	FSMEvent *e = new FSMEvent(USER_EVT_RESET);
 	PostEventFIFO(e);

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -101,7 +101,7 @@ unsigned int CCardReadAdapterFSM::s1_on_event(FSMEvent* pEvt)
 void CCardReadAdapterFSM::s2_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
 	m_resetTimes = 0;
 	m_testResult = Error_Succeed;
 	m_bIssuingExit = false;
@@ -580,7 +580,7 @@ void CCardReadAdapterFSM::s4_on_entry()
 {
 	LOG_FUNCTION();
 	m_lastS2Event = m_lastS2EvtParam1 = 0;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
 }
 void CCardReadAdapterFSM::s4_on_exit()
 {

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -80,7 +80,7 @@ unsigned int CContactlessCardFSM::s1_on_event(FSMEvent* event)
 void CContactlessCardFSM::s2_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_IDLE);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_IDLE);
 	m_eDevState = DEVICE_STATUS_NORMAL;
 	m_resetTimes = 0;
 	m_testResult = Error_Succeed;
@@ -205,7 +205,7 @@ unsigned int CContactlessCardFSM::s3_on_event(FSMEvent* pEvt)
 void CContactlessCardFSM::s4_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_HOLD);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_HOLD);
 }
 void CContactlessCardFSM::s4_on_exit()
 {
@@ -304,7 +304,7 @@ unsigned int CContactlessCardFSM::s4_on_event(FSMEvent* pEvt)
 void CContactlessCardFSM::s5_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_READING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_READING);
 }
 void CContactlessCardFSM::s5_on_exit()
 {
@@ -367,7 +367,7 @@ unsigned int CContactlessCardFSM::s6_on_event(FSMEvent* pEvt)
 void CContactlessCardFSM::s7_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_WAITFETCHING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_WAITFETCHING);
 	WaitFetchingTask* task = new WaitFetchingTask(this);
 	GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 }
@@ -452,7 +452,7 @@ unsigned int CContactlessCardFSM::s8_on_event(FSMEvent* pEvt)
 void CContactlessCardFSM::s9_on_entry()
 {
 	LOG_FUNCTION();
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_FAILED);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CONTACTLESSCARD_FAILED);
 	m_eDevState = DEVICE_STATUS_FAULT;
 	FSMEvent *e = new FSMEvent(USER_EVT_RESET);
 	PostEventFIFO(e);
@@ -1373,12 +1373,12 @@ int CContactlessCardFSM::QueryCardInfo(SpReqAnsContext<ContactlessCardService_Qu
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("QueryCardInfo, eMedia pos:%d",devStatus.eMediaPos);
 	switch(devStatus.eMediaPos)
 	{
-	case CI_MEDIA_IC:
-		ret = 2;
-		break;
-	case CI_MEDIA_NOT_IC:
-		ret = 3;
-		break;
+	//case CI_MEDIA_IC:
+	//	ret = 2;
+	//	break;
+	//case CI_MEDIA_NOT_IC:
+	//	ret = 3;
+	//	break;
 	case CI_MEDIA_RF:
 		ret = 4;
 		break;

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -141,7 +141,7 @@ void CCardIssuerFSM::s2_on_entry()
 	LOG_FUNCTION();
 	ToLogWarnInfoAboutTermCustom();
 	m_currentFSMState = 2;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
 	SetDevStateAndSendMsg(DEVICE_STATUS_NORMAL, false);
 	
 	m_resetTimes = 0;
@@ -347,7 +347,7 @@ void CCardIssuerFSM::s4_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 4;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
 }
 void CCardIssuerFSM::s4_on_exit()
 {
@@ -609,7 +609,7 @@ void CCardIssuerFSM::s5_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 5;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_READING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_READING);
 }
 void CCardIssuerFSM::s5_on_exit()
 {
@@ -690,7 +690,7 @@ void CCardIssuerFSM::s7_on_entry()
 {
 	LOG_FUNCTION();
 	m_currentFSMState = 7;
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_WAITFETCHING);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_WAITFETCHING);
 	WaitFetchingTask* task = new WaitFetchingTask(this);
 	GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 }
@@ -907,7 +907,7 @@ void CCardIssuerFSM::s9_on_entry()
 	LOG_FUNCTION();
 	m_currentFSMState = 9;
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer in fault state, need to reset.");
-	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDSWIPER_FAILED);
+	//GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDSWIPER_FAILED);
 	SetDevStateAndSendMsg(DEVICE_STATUS_FAULT);
 	FSMEvent *e = new FSMEvent(USER_EVT_RESET);
 	PostEventFIFO(e);