Z991239-6413 #comment ip获取校正

Framework/RvcLogSdk/log_util.cpp

@@ -146,7 +146,7 @@ void GetUnitedTimeStr(time_t time, char* szTime)
 	);
 }
 
-//TODO: CrossPlaform  [Gifur@2025729]
+//TODO: CrossPlaform  相对独立，不用框架库提供的函数进行IP 获取 [Gifur@2025729]
 int GetLocalIP(char* ip_str)
 {
 	

Framework/libtoolkit/sockutil.c

@@ -41,8 +41,8 @@ static int is_legal_ip(char* content)
 		return 1;
 	}
 
-	if (strcmp(content, "127.0.0.1" == 0) /*sipphone*/
-		|| strcmp(content, "2.0.0.1" == 0) /*ConnecotrFSM*/
+	if (strcmp(content, "127.0.0.1") == 0 /*sipphone*/
+		|| strcmp(content, "2.0.0.1") == 0 /*ConnecotrFSM*/
 		|| strstr(content, "198.168.") == content /*sipphone Ë«Íø¿¨*/
 		) {
 		return -1;

Module/mod_vtmloader/CMakeLists.txt

@@ -18,6 +18,14 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${DevHeadPath}
 	${MODULE_BASE_DIR}/mod_healthmanager
+	${MODULE_BASE_DIR}/mod_pinpad
+	${MODULE_BASE_DIR}/mod_CardIssuerStand
+	${MODULE_BASE_DIR}/mod_cardissuerstore
+	${MODULE_BASE_DIR}/mod_IDCertificate
+	${MODULE_BASE_DIR}/mod_HSPScanner
+	${MODULE_BASE_DIR}/mod_ContactlessCard
+	${MODULE_BASE_DIR}/mod_FingerPrint
+	${MODULE_BASE_DIR}/mod_gpio
 	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -17,15 +17,15 @@
 #include <errno.h>
 #include "RestfulFunc.h"
 #endif //RVC_OS_WIN
-#include "../mod_healthmanager/HealthManager_client_g.h"
-#include "../mod_pinpad/PinPad_client_g.h"
-#include "../mod_CardIssuerStand/CardIssuerStand_client_g.h"
-#include "../mod_cardissuerstore/CardIssuerStore_client_g.h"
-#include "../mod_IDCertificate/IDCertificate_client_g.h"
-#include "../mod_HSPScanner/HSPScanner_client_g.h"
-#include "../mod_ContactlessCard/ContactlessCard_client_g.h"
-#include "../mod_FingerPrint/FingerPrint_client_g.h"
-#include "../mod_gpio/Gpio_client_g.h"
+#include "HealthManager_client_g.h"
+#include "PinPad_client_g.h"
+#include "CardIssuerStand_client_g.h"
+#include "CardIssuerStore_client_g.h"
+#include "IDCertificate_client_g.h"
+#include "HSPScanner_client_g.h"
+#include "ContactlessCard_client_g.h"
+#include "FingerPrint_client_g.h"
+#include "Gpio_client_g.h"
 #include "SpDefine.h"
 
 using namespace HealthManager;
@@ -256,6 +256,7 @@ ErrorCodeEnum CVtmLoaderFSM::OnInit()
 	AddStateHooker(this);
 
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(m_sysInfo);
+
 	return Error_Succeed;
 }