Z991239-6196 #comment [ResourceWatcher]去除废弃的部分代码

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -175,10 +175,9 @@ struct SetupSoftInfo
 };
 
 ResourceWatcherFSM::ResourceWatcherFSM(void)
-    :m_strTerminalNo(true),
-    m_bFirstRunAfterBoot(FALSE),
+    :m_bFirstRunAfterBoot(FALSE),
     m_cpuTop(0), flag4DeleteKeyAutoStartFile(false), flag4DoAutoStartTaskIgnoreBoot(FALSE), m_skipDesktopDetect(FALSE)
-    , m_strCurrentUserName(true), m_strLoginedUserName(true)
+    , m_strLoginedUserName(true)
 {
 #ifdef RVC_OS_WIN
     m_iNonSignedTotal = 0;
@@ -378,17 +377,10 @@ ErrorCodeEnum ResourceWatcherFSM::OnInit()
     GetEntityBase()->GetFunction()->OpenConfig(Config_Run, spRunConfig);
     GetEntityBase()->GetFunction()->OpenConfig(Config_CenterSetting, spCtSettingConfig);
     erroCode = GetEntityBase()->GetFunction()->GetSystemStaticInfo(m_RvcSysinfo);
-    m_strTerminalNo = m_RvcSysinfo.strTerminalID;
     m_bFirstRunAfterBoot = DetectIsFirstRunAtBoot();
     if (m_bFirstRunAfterBoot) {
         DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("First time to run after system boot.");
     }
-#if defined(RVC_OS_WIN)
-    if (m_bFirstRunAfterBoot) {
-
-    }
-    
-#endif //RVC_OS_WIN
 
     spCtSettingConfig->ReadConfigValueInt(m_pEntity->GetEntityName(), "DisplayCnt", m_iNonSignedDisplay);
     if (m_iNonSignedDisplay <= 0)
@@ -3945,18 +3937,6 @@ void ResourceWatcherFSM::InitUserInfo()
 		}
     }
 
-	const DWORD INFO_BUFFER_SIZE = 128;
-	char infoBuf[INFO_BUFFER_SIZE];
-	ZeroMemory(infoBuf, INFO_BUFFER_SIZE);
-	DWORD bufCharCount = INFO_BUFFER_SIZE;
-	if (!GetUserName(infoBuf, &bufCharCount)) {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetUserName failed, GLE=%u", GetLastError());
-	}
-	else {
-		m_strCurrentUserName = infoBuf;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Current user name:%s", m_strCurrentUserName.GetData());
-	}
-
 	DWORD dwSessionId = WTSGetActiveConsoleSessionId();
 	LPTSTR pBuffer = NULL;
 	DWORD dwBufferLen;

Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -246,17 +246,8 @@ public:
 	void DetectSoftwareInstallStatus();
 
 private:
-
     int m_cpuTop; // CPU资源消耗最高的top进程个数
     CSystemStaticInfo m_RvcSysinfo;
-	typedef std::string bs_key;
-	typedef DWORD bs_value;
-	typedef map<bs_key, bs_value> BlackSheet;
-	typedef BlackSheet::const_iterator const_bs_iter;
-	typedef BlackSheet::iterator bs_iter;
-	typedef std::pair<bs_key, bs_value> BlackSheetPair;
-    std::map<std::string, DWORD> m_forbidDirList;
-	CSimpleStringA m_strTerminalNo;
     BOOL m_bFirstRunAfterBoot;
 
 	int m_diskLastWarnHour;
@@ -278,11 +269,9 @@ private:
 
 	std::vector<std::string> keyUserlist;
 	std::vector<std::string> keyPublist;
-	//std::vector<std::string> delKeylist;
 	BOOL flag4DeleteKeyAutoStartFile;
 	BOOL flag4DoAutoStartTaskIgnoreBoot;
 
-	CSimpleStringA m_strCurrentUserName;
 	CSimpleStringA m_strLoginedUserName;
 
 public:

Module/mod_ResourceWatcher/mod_ResourceWatcher.h

@@ -87,15 +87,10 @@ public:
 		if (errorCode == Error_Succeed) {
 
             CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-            CSystemStaticInfo staticInfo;
-            spEntityFunction->GetSystemStaticInfo(staticInfo);
-			
-			updateShowFlag = false;
 			newestSogouInstall = false;
 			lastUpgradeInstallTime = 0; //上次升级安装时间
 			lastUpgradeSwitchTime = 0;  //上次升级切换时间
 			lastSogouChangeEndTime = 0;    //上一次切换结束判定的时间
-			lastSogouChangeWarn = "";  //上一次搜狗告警信息
 			sogouProcessRun = 0;      //搜狗进程是否启动
 
 			errorCode = spEntityFunction->SubscribeBroadcast("UpgradeManager", NULL, this, m_uuidUpgradeStateEventListener);
@@ -374,14 +369,11 @@ private:
 private:
 	ResourceWatcherFSM m_fsm;
 	CUUID m_uuidUpgradeStateEventListener;
-	BOOL updateShowFlag;
 	BOOL newestSogouInstall; //最近一次安装的标志
 
 	time_t lastUpgradeInstallTime; //上次升级安装时间
 	time_t lastUpgradeSwitchTime;  //上次升级切换时间
 	time_t lastSogouChangeEndTime;    //上一次进程切换时间
-	CSimpleStringA lastSogouChangeWarn;  //上一次搜狗告警信息
-	BOOL isSogouUpdateChange;
 	int sogouProcessRun;
 
 	vector<CSimpleStringA> sogouChangeWarn;