|
|
@@ -49,6 +49,7 @@ enum EntityOP
|
|
|
|
|
|
ErrorCodeEnum CHealthManagerFSM::Initial()
|
|
|
{
|
|
|
+ m_netList.Init(0);
|
|
|
#if defined(RVC_OS_WIN)
|
|
|
SaveOsVersion();
|
|
|
#endif
|
|
|
@@ -63,17 +64,6 @@ ErrorCodeEnum CHealthManagerFSM::Initial()
|
|
|
CSmartPointer<IConfigInfo> spConfigCen;
|
|
|
GetEntityBase()->GetFunction()->OpenConfig(Config_CenterSetting, spConfigCen);
|
|
|
|
|
|
-#if defined(RVC_OS_LINUX)
|
|
|
- if (!m_sysInfo.strMachineType.IsNullOrEmpty() && m_sysInfo.strMachineType.Compare("RVC.Stand2S") != 0
|
|
|
- && m_sysInfo.strMachineType.Compare("RVC.Stand1SPlus") != 0) {
|
|
|
- CSimpleStringA strErrMsg = CSimpleStringA::Format("当前版本不支持此机型：%s", (LPCTSTR)m_sysInfo.strMachineType);
|
|
|
- SP::Module::Comm::LogErrorNotiyStruct notifyItem(Error_NotSupport, 0);
|
|
|
- SP::Module::Comm::LogNotiyMessageStruct notifyMsg(strErrMsg);
|
|
|
- notifyItem.Notify(notifyMsg);
|
|
|
- return Error_Succeed;
|
|
|
- }
|
|
|
-#endif //RVC_OS_LINUX
|
|
|
-
|
|
|
spConfigCen->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "WKUpdatePeriod", m_wkUpdatePeriod);
|
|
|
if (m_wkUpdatePeriod <= 0 || m_wkUpdatePeriod > 365)
|
|
|
m_wkUpdatePeriod = 30;//default
|
|
|
@@ -89,7 +79,7 @@ ErrorCodeEnum CHealthManagerFSM::Initial()
|
|
|
GetEntityBase()->GetFunction()->SetSysVar("TerminalStage", "X");
|
|
|
WaitDeamonFinishTask* task = new WaitDeamonFinishTask(this);
|
|
|
GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
|
|
|
- m_netList.Init(0);
|
|
|
+
|
|
|
SP::Module::Net::GetINETMacAddresses(m_netList);
|
|
|
|
|
|
return Error_Succeed;
|
oilyang