#IQRV #comment 添加测试日志 gift4haichun

Module/include/DevEntityCommBase.hpp

@@ -220,8 +220,6 @@ inline ErrorCodeEnum CDevAdptEntityBase::ExtractVendorLibFullPath(CSimpleStringA
 
 inline void CDevAdptEntityBase::InitializeVendorLogSwitch()
 {
-	LOG_FUNCTION();
-
 	if (!vendorLibInfo.IsValid()) {
 		ExtractVendorLibName();
 	}

Module/include/DevFSMCommBase.hpp

@@ -1010,17 +1010,33 @@ public:
 		return result;
  	}
 
-	virtual void SetDevInitFlag(bool val = true) { m_bOpened = val; }
-	bool GetDevInitFlag() const { return m_bOpened; }
+	virtual void SetDevInitFlag(bool val = true) {
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		m_bOpened = val; 
 
-	virtual void SetDevInitingFlag(bool val = true) { m_bOpening = val; }
-	bool GetDevInitingFlag() const { return m_bOpening; }
+	}
+	bool GetDevInitFlag() const { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		return m_bOpened; 
+	}
 
-	virtual void SetInWhatPage(int iPageType) { m_iInWhatPage = iPageType; }
+	virtual void SetDevInitingFlag(bool val = true) { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		m_bOpening = val; 
+	}
+	bool GetDevInitingFlag() const { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		return m_bOpening; 
+	}
+
+	virtual void SetInWhatPage(int iPageType) { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		m_iInWhatPage = iPageType; 
+	}
 
 	void OnUIState4SetWhatPage(const char* pcszValue) {
 		if (pcszValue != NULL && strlen(pcszValue) > 0) {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("test===%s", pcszValue);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
 			//增加页面位置判断
 			if (_strnicmp(pcszValue, "M", strlen("M")) == 0) {
 				SetInWhatPage(PageType_MainPage);
@@ -1034,8 +1050,14 @@ public:
 		}
 	}
 
-	virtual DevStateEnum GetDevState() const { return m_eDevState; }
-	void SetDevState(DevStateEnum val) { m_eDevState = val; }
+	virtual DevStateEnum GetDevState() const { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		return m_eDevState; 
+	}
+	void SetDevState(DevStateEnum val) { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		m_eDevState = val; 
+	}
 
 public:
 
@@ -1136,7 +1158,10 @@ protected:
 	int CountDevError(CEntityBase *pEntityBase);
 
 	
-	virtual bool IsInBusiness() const { return (m_iInWhatPage == PageType_Other); }
+	virtual bool IsInBusiness() const { 
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
+		return (m_iInWhatPage == PageType_Other); 
+	}
 	
 	virtual void OnHardwareShakeHand(CSmartPointer<ITransactionContext> pTransactionContext);
 
@@ -1231,6 +1256,7 @@ int CCommDevFSM<TFSM, TDevClass>::CountDevError(CEntityBase* pEntityBase)
 template<class TFSM, class TDevClass>
 void CCommDevFSM<TFSM, TDevClass>::OnHardwareShakeHand(CSmartPointer<ITransactionContext> pTransactionContext)
 {
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
 	if (m_eDevState == DEVICE_STATUS_NORMAL)
 		pTransactionContext->SendAnswer(Error_Succeed);
 	else

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -872,7 +872,7 @@ public:
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 	DevStateEnum GetDevState() const
 	{
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("test==GetDevState");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("override by entity itself==GetDevState");
 		if ((m_eDevState == DEVICE_STATUS_NORMAL) 
 			&& ((m_bHasHopper[0] && m_mixedEx[0] >= 3) || !m_bHasHopper[0])
 			&& ((m_bHasHopper[1] && m_mixedEx[1] >= 3) || !m_bHasHopper[1])

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -1219,7 +1219,7 @@ public:
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 	DevStateEnum GetDevState() const
 	{
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("test==GetDevState");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("override by entity itself==GetDevState");
 		if ((m_eDevState == DEVICE_STATUS_NORMAL) 
 			&& ((m_bHasHopper[0] && m_mixedEx[0] >= 3) || !m_bHasHopper[0])
 			&& ((m_bHasHopper[1] && m_mixedEx[1] >= 3) || !m_bHasHopper[1])
@@ -1374,7 +1374,7 @@ private:
 	CSimpleStringA generateJsonString(std::map<std::string, JsonElem>& objectArr);
 	bool IsInBusiness() const
 	{
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("test==IsInBusiness");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("override by entity itself ==IsInBusiness");
 		return (m_bCrossPreOnline || m_iInWhatPage == PageType_Other);
 	}
 

Module/mod_pinpad/PinPadFSM.cpp

@@ -44,7 +44,6 @@ void CPinPadFSM::ToLogWarnInfoAboutTermCustom()
 
 ErrorCodeEnum CPinPadFSM::OnInit()
 {
-	LOG_FUNCTION();
 	m_bOpening = true;
 	CSystemStaticInfo sysInfo;
 	m_csMachineType = m_terminalNo = "";

Module/mod_pinpad/mod_PinPad.h

@@ -56,14 +56,11 @@ public:
 
 	virtual ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError)
 	{
-		LOG_FUNCTION();
-		//MessageBoxA(0,0,0,0);
 		ErrorCodeEnum Error = m_fsm.Init(this);		
 		return Error;
 	}
 	virtual ErrorCodeEnum __OnPause(ErrorCodeEnum preOperationError)
 	{
-		LOG_FUNCTION();
 		return Error_Succeed;
 	}
 
@@ -87,7 +84,6 @@ public:
 	}
 	void Exit(SpOnewayCallContext<PinPadService_Exit_Info>::Pointer ctx)
 	{
-		//LOG_FUNCTION();
 		FSMEvent *evt = new FSMEvent(USER_EVT_EXIT);
 		m_fsm.PostEventFIFO(evt);
 	}