Z991239-5199 #comment feat:同步除fsm.cpp以外的文件

Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -38,12 +38,12 @@ using namespace std;
 #include "FileSimpleComp.h"
 #include "CommEntityUtil.hpp"
 #else
+#pragma comment(lib, "ws2_32.lib")
+#pragma comment(lib, "mbnapi_uuid.lib")
 #include "ResourceWatcher_UserCode.h"
 #include "FileSimpleComp.h"
-
-//#include <SDL.h>
-//#include <SDL_syswm.h>
 #include <time.h>
+#pragma comment(lib, "Gdi32.lib")
 #endif //  RVC_OS_LINUX
 
 #define DEFAULT_INTERVAL 1000
@@ -236,11 +236,13 @@ struct SystemBasicInfo
 
 	SystemBasicInfo():strManufacturer(true), strProductName(true), strSerialNumber(true) {}
 };
+
 const int DEFAULT_DAY_OF_BACKWARD = 90;
 
 class ResourceWatcherFSM : public FSMImpl<ResourceWatcherFSM>
 {
 public:
+#ifdef RVC_OS_LINUX
 	ResourceWatcherFSM(void)
 		:m_IsPadDevice(FALSE),
 		m_csUploadVideoPath(true),
@@ -255,23 +257,16 @@ public:
 		m_bIsConfigMode(FALSE),
 		m_cpuTop(0)
 	{
-#if defined(RVC_OS_WIN)
-		m_iNonSignedTotal = 0;
-		m_xIdlePre = 0;
-		m_xKernelPre = 0;
-		m_xUserPre = 0;
-		m_bNeedForceDiskCheck = false;
-		m_DoneDetectAutostart = true;
-		mUiRequireBytes.QuadPart = 0ui64;
-		mUiCalibration.QuadPart = 0ui64;
-#else
 		mAllVideoFileSizeCal = 0;
 		mMaxFileSize = 0;
 		mUiCalibration = 0;
 		mUiRequireBytes = 0;
 		mftAd0RemoveTime = 0;
-#endif //RVC_OS_WIN
 	};
+#else
+	ResourceWatcherFSM(void);
+#endif // RVC_OS_LINUX
+
 	~ResourceWatcherFSM(void);
 
 	enum { s0, s1, s2, s3 };

Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -14,8 +14,6 @@
 #include <direct.h>
 #include <psapi.h>  
 #include <sys/stat.h>
-//#include <SDL.h>
-//#include <SDL_syswm.h>
 #else
 #include "SogouVersion.h"
 #include <winpr/sysinfo.h>
@@ -40,6 +38,14 @@
 #include "mod_ResourceWatcher.h"
 #include "ResourceWatcher_UserCode.h"
 
+#ifdef RVC_OS_WIN
+#pragma comment(lib, "shell32.lib")
+#pragma comment(lib, "Wintrust.lib")   
+#pragma comment(lib, "crypt32.lib")
+#pragma comment(lib, "Gdi32.lib")
+#pragma comment(lib, "User32.lib")
+#endif // RVC_OS_WIN
+
 using namespace HealthManager;
 
 #define SafeDeleteArraySize(pData) { if(pData){delete []pData;pData=NULL;} }  

Module/mod_ResourceWatcher/mod_ResourceWatcher.h

@@ -58,10 +58,10 @@ private:
 class ResourceWatcherEntity : public CEntityBase, public IBroadcastListener, public ITimerListener, public ISysVarListener
 {
 public:
-	ResourceWatcherEntity() :m_bInitMode(FALSE) {}
+	ResourceWatcherEntity():m_bInitMode(FALSE) {}
 	virtual ~ResourceWatcherEntity() {}
 	virtual const char* GetEntityName() const { return "ResourceWatcher"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
+    const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual CServerSessionBase* OnNewSession(const char*, const char*)
 	{
@@ -75,21 +75,21 @@ public:
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Version %s; Complied at: %s %s", MOD_VERSION, __DATE__, __TIME__);
 
 		ErrorCodeEnum errorCode = Error_Succeed;
-		CSimpleStringA strtermState;
-		GetFunction()->GetSysVar("TerminalStage", strtermState);
-		if (strtermState.IsStartWith("Z=")) {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("entity in config mode");
-			m_bInitMode = TRUE;
-		}
+        CSimpleStringA strtermState;
+        GetFunction()->GetSysVar("TerminalStage", strtermState);
+        if (strtermState.IsStartWith("Z=")) {
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("entity in config mode");
+            m_bInitMode = TRUE;
+        }
 
 		errorCode = m_fsm.Init(this);
 
 		if (errorCode == Error_Succeed) {
 
-			CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-			CSystemStaticInfo staticInfo;
-			spEntityFunction->GetSystemStaticInfo(staticInfo);
-
+            CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
+            CSystemStaticInfo staticInfo;
+            spEntityFunction->GetSystemStaticInfo(staticInfo);
+			
 			updateShowFlag = false;
 			newestSogouInstall = false;
 			lastUpgradeInstallTime = 0; //上次升级安装时间
@@ -98,7 +98,6 @@ public:
 			lastSogouChangeWarn = "";  //上一次搜狗告警信息
 			sogouProcessRun = 0;      //搜狗进程是否启动
 
-
 			errorCode = spEntityFunction->SubscribeBroadcast("UpgradeManager", NULL, this, m_uuidUpgradeStateEventListener);
 			if (errorCode != Error_Succeed)
 			{
@@ -107,7 +106,7 @@ public:
 				return;
 			}
 		}
-
+		
 		pTransactionContext->SendAnswer(errorCode);
 	}