Browse Source

#IQRV #comment [Healthmanger] CheckSafeLoadResult 无此函数定义,删除

gifur 4 years ago
parent
commit
4edf390967
1 changed files with 10 additions and 8 deletions
  1. 10 8
      Module/mod_healthmanager/HealthManagerFSM.h

+ 10 - 8
Module/mod_healthmanager/HealthManagerFSM.h

@@ -9,16 +9,20 @@
 using namespace std;
 
 #include "HealthManager_msg_g.h"
-#include "../mod_accessauth/AccessAuthorization_client_g.h"
-#include "../mod_Initializer/Initializer_client_g.h"
-#include "../mod_DeviceControl/DeviceControl_client_g.h"
-#include "../mod_pinpad/PinPad_client_g.h"
-#include "../mod_cardswiper/CardSwiper_msg_g.h"
+#include "AccessAuthorization_client_g.h"
+#include "Initializer_client_g.h"
+#include "DeviceControl_client_g.h"
+#include "PinPad_client_g.h"
+
 using namespace AccessAuthorization;
 using namespace Initializer;
 using namespace DeviceControl;
 using namespace PinPad;
+
+#if defined(RVC_OS_WIN)
+#include "CardSwiper_msg_g.h"
 using namespace CardSwiper;
+#endif //RVC_OS_WIN
 
 enum EvtType
 {
@@ -185,7 +189,7 @@ public:
 	,m_bAccessAuth(false),m_bACFailed(false),m_pInitClient(NULL),m_bInitSuc(false),m_bInitFail(false)
 	, m_bIdleToMaintain(false), m_custMngerState(0), m_pDevCtrlClient(NULL), m_bHasAuthEver(false)
 	, m_checkCode(""), m_accessAuthCheckMD5(0), m_havReceiveMD5OK(0), m_bFirstAccessAuth(true), m_bEverAuthSucWithDevice(false)
-	, m_bIEBeforeHealth(false), m_hasCfgGpioInRootIni(false), m_csErrEntity(""){}
+	, m_bIEBeforeHealth(false), m_hasCfgGpioInRootIni(false), m_csErrEntity("") {}
 	~CHealthManagerFSM(){}
 	virtual ErrorCodeEnum OnInit();
 	virtual ErrorCodeEnum OnExit();
@@ -234,8 +238,6 @@ public:
 	int OpLoadDoWork();
 	int AccessAuthDoWork();
 	int CheckLoadResult(LoadStage eStage);
-	int CheckSafeLoadResult();
-	int CheckOperatingResult();
 	void SetAccessAuth(bool bResult=true);
 	bool GetAccessAuthFlag(){return m_bAccessAuth;}
 	void SetAccessFailedFlag(bool bValue = true) { m_bACFailed = bValue; }