Răsfoiți Sursa

#IQRV #comment [Bugfix] 国产化添加不支持非大机外的机型

gifur 4 ani în urmă
părinte
comite
c9b1741898

+ 2 - 2
Module/mod_healthmanager/CMakeLists.txt

@@ -26,9 +26,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 )
 
 # 添加实体需要依赖的其他共享库(包括系统库)
-set(${MODULE_PREFIX}_SYSLIBS)
+set(${MODULE_PREFIX}_SYSLIBS libpublicFun)
 if(MSVC)
-	list(APPEND ${MODULE_PREFIX}_SYSLIBS Ws2_32 libpublicFun)
+	list(APPEND ${MODULE_PREFIX}_SYSLIBS Ws2_32)
 endif(MSVC)
 set(${MODULE_PREFIX}_LIBS)
 target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} ${${MODULE_PREFIX}_LIBS} ${${MODULE_PREFIX}_SYSLIBS})

+ 15 - 2
Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -10,6 +10,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #endif
+#include "CommEntityUtil.hpp"
 #include "mod_healthmanager.h"
 
 using namespace std;
@@ -1178,8 +1179,20 @@ ErrorCodeEnum CHealthManagerFSM::Initial()
 	CSimpleStringA sysinfoPath = "";
 
 	
-	WaitDeamonFinishTask* task = new WaitDeamonFinishTask(this);
-	GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
+#ifndef _WIN32
+
+	if (m_sysInfo.strMachineType.Compare("RVC.Stand2S") != 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 //NOT _WIN32
+
+    WaitDeamonFinishTask* task = new WaitDeamonFinishTask(this);
+    GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 
 	return Error_Succeed;
 }