#IQBX #comment UOS下回归编译修复

CMakeLists.txt

@@ -284,9 +284,15 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
+if(MSVC)
 conan_cmake_run(REQUIRES RvcFramework/1.10.0.3@LR04.02_FrameworkLib/testing
 	Audio/2023.0509.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
+else()
+conan_cmake_run(REQUIRES RvcFramework/1.10.0.3@LR04.02_FrameworkLib/dev
+	Audio/2023.0509.01@LR04.02_MediaRes/testing
+BASIC_SETUP CMAKE_TARGETS)
+endif(MSVC)
 include(DependencyConanFiles)
 
 set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})

DevAdapter/include/CardAssist.h

@@ -7,7 +7,7 @@
 #include "CardSwiperClass.h"
 #include "RFICClass.h"
 #include "../../Module/mod_cardissuer/CardIssuer_UserErrorCode.h"
-#include "../../Module/mod_CardSwiper/CardSwiper_UserErrorCode.h"
+#include "../../Module/mod_cardswiper/CardSwiper_UserErrorCode.h"
 #include "../../Module/mod_ContactlessCard/ContactlessCard_UserErrorCode.h"
 
 #include <vector>

Module/mod_CameraConfigManage/mod_CameraConfigManage.cpp

@@ -3,7 +3,7 @@
 #include "Event.h"
 #include "rec_common.h"
 #include "SpComm.hpp"
-
+#include "CommEntityUtil.hpp"
 #if defined(RVC_OS_WIN)
 #include <tchar.h>
 #include "SetupApi.h"
@@ -92,13 +92,13 @@ void CCameraConfigManageEntity::OnPreStart(
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	SP::MachineFormat::Site site = SP::MachineFormat::Str2Site(stStaticinfo.strSite);
-    SP::MachineFormat::What type = SP::MachineFormat::Str2Type(stStaticinfo.strSite);
+	SP::Module::Comm::Site site = SP::Module::Comm::Str2Site(stStaticinfo.strSite);
+	SP::Module::Comm::What type = SP::Module::Comm::Str2Type(stStaticinfo.strSite);
 
 
-	if (type == SP::MachineFormat::RVC_PAD)
+	if (type == SP::Module::Comm::RVC_PAD)
 	{
-		if (site == SP::MachineFormat::CMB_FLB)
+		if (site == SP::Module::Comm::CMB_FLB)
 		{
 			LOG_TRACE("the type is mobile pad");
 			m_eDeviceType = eMobilePadType;
@@ -109,16 +109,11 @@ void CCameraConfigManageEntity::OnPreStart(
 			m_eDeviceType = ePadtype;
 		}
 	}
-	else if (type == SP::MachineFormat::RVC_Desk2S)
+	else if (type == SP::Module::Comm::RVC_Desk2S)
 	{
 		LOG_TRACE("the type is Desk2S");
 		m_eDeviceType = eDesk2SType;
 	}
-	else if (type == SP::MachineFormat::RPM_Stand1S)
-	{
-		LOG_TRACE("the type is RPM.Stand1S");
-		m_eDeviceType = eRpm1sType;
-	}
 	else
 	{
 		LOG_TRACE("the type is standard");

Module/mod_RomoteController/CMakeLists.txt

@@ -52,9 +52,6 @@ set(${MODULE_PREFIX}_SRCS
 	)
 endif(WIN32)
 
-
-
-
 set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 

Module/mod_RomoteController/RemoteControllerCnn.cpp

@@ -55,6 +55,21 @@ namespace fs = boost::filesystem;
 #define ZeroMemory(object, size) memset(object, 0, size)
 #define WritePrivateProfileStringA(a, b, c, d) Base_writeIni(std::string(a), std::string(b), std::string(c), std::string(d))
 
+#if defined(RVC_OS_LINUX)
+void _ui64toa(unsigned long long large_unit, char* str, int hexdigith)
+{
+	auto largeNumStr = std::to_string(large_unit);
+	strcpy(str, largeNumStr.c_str());
+
+	/*
+	std::stringstream ss;
+	ss << large_unit;
+	std::string src = ss.str();
+	memset(str, 0, strsize);
+	strncpy(str, src.c_str(), strsize);
+	*/
+}
+#endif //RVC_OS_LINUX
 
 int strncpy_s(char* _Destination, size_t _SizeInBytes, char const* _Source, size_t _MaxCount)
 {

Module/mod_RomoteController/mod_RemoteController.cpp

@@ -33,13 +33,8 @@ public:
 	virtual void OnStarted()
 	{
 		m_FSM.Init(this);
-
 		// subscribe heartbeat entity event for create remote control channel
 		GetFunction()->SubscribeLog(m_LogSubID, this, Log_Event,  Severity_None, Error_IgnoreAll, EVENT_START_REMOTE_CONTROL, "HeartBeat", true);
-
-		// {TEST}+
-		//m_FSM.PostEventFIFO(new FSMEvent(CRemoteControllerFSM::Event_CreateChannel));		
-		// {TEST}-
 	}	
 
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext)

Module/mod_chromium/CMakeLists.txt

@@ -6,7 +6,6 @@ set(LINKINFO_ON ON)
 
 
 file(GLOB REQUESTS_CPP_SRCS ${ThirdPartyHeadRoot}/requests/requests/*.cpp)
-file(GLOB PORTCHECK_SRCS portCheck/*)
 file(GLOB GUITASK_SRCS guitask/*)
 
 MESSAGE( STATUS "REQUESTS_CPP_SRCS = ${REQUESTS_CPP_SRCS}")
@@ -93,7 +92,6 @@ set(${MODULE_PREFIX}_SRCS
 	uuid4.h
 	uuid4.cpp
 	SystemRun.cpp
-	${PORTCHECK_SRCS}
 	${GUITASK_SRCS}
 	${ThirdPartyHeadRoot}/CJson/cJSON.c
 	${ThirdPartyHeadRoot}/modp_b64/modp_b64.cc
@@ -179,7 +177,11 @@ target_include_directories(${MODULE_NAME} PRIVATE
 )
 # 添加实体需要依赖的其他共享库（包括系统库）：连接器包含的包
 target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_BOOST} ${CONAN_LIB_DIRS_OPENSSL} ${CONAN_LIB_DIRS_CEFCONTROL} ${LIBPROFILER_LIBRARY_DIRS})
+if(MSVC)
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} ${CONAN_PKG_LIBS_OPENSSL} ${CONAN_PKG_LIBS_CEFCONTROL})
+else()
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} ${CONAN_PKG_LIBS_OPENSSL})
+endif(MSVC)
 
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${Boost_LIBRARIES} libpublicFun ${LIBPROFILER_LIBRARY} )  

Module/mod_counterconnector/callrouter.cpp

@@ -10,6 +10,9 @@
 #include <process.h>
 #include <DbgHelp.h>
 #pragma comment(lib, "dbghelp.lib")
+
+typedef int SOCKET;
+
 #else
 #include <sys/socket.h>
 #include <fcntl.h>
@@ -23,7 +26,6 @@
 #include <sys/types.h>
 
 
-typedef int SOCKET;
 
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET (SOCKET)(~0)

Module/mod_healthmanager/HealthManagerFSM.h

@@ -11,9 +11,9 @@ using namespace std;
 #include "CommEntitySettings.hpp"
 #include "HealthManager_msg_g.h"
 #include "HealthManager_def_g.h"
-#include "../mod_accessauth/AccessAuthorization_client_g.h"
-#include "../mod_DeviceControl/DeviceControl_client_g.h"
-#include "../mod_pinpad/PinPad_client_g.h"
+#include "AccessAuthorization_client_g.h"
+#include "DeviceControl_client_g.h"
+#include "PinPad_client_g.h"
 using namespace HealthManager;
 using namespace AccessAuthorization;
 using namespace DeviceControl;
@@ -21,7 +21,10 @@ using namespace DeviceControl;
 #include "ResourceWatcher_client_g.h"
 using namespace ResourceWatcher;
 #include "json/json.h"
+
+#if defined(RVC_OS_WIN)
 #include <xstring>
+#endif //RVC_OS_WIN
 
 using namespace PinPad;
 enum HealthManger_UserErrorCode {

Other/libRestfulFunc/SocketConnectImpl.cpp

@@ -20,9 +20,9 @@
 #include<arpa/inet.h>
 #include<unistd.h>
 #include<sys/time.h>
+#include <string.h>
 #endif //_MSC_VER
 
-
 int SocketConnectTest(const std::string& addrIP, int nPort, std::string& out_msg)
 {
 #if defined(_MSC_VER)

ThirdParty/Include/websocketpp/websocketpp/transport/asio/security/tls.hpp

@@ -355,13 +355,18 @@ protected:
     template <typename ErrorCodeType>
     lib::error_code translate_ec(ErrorCodeType ec) {
         if (ec.category() == lib::asio::error::get_ssl_category()) {
+#ifdef SSL_R_SHORT_READ
             if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
                 return make_error_code(transport::error::tls_short_read);
-            } else {
+            }
+            else {
+#endif
                 // We know it is a TLS related error, but otherwise don't know
                 // more. Pass through as TLS generic.
                 return make_error_code(transport::error::tls_error);
+#ifdef SSL_R_SHORT_READ
             }
+#endif
         } else {
             // We don't know any more information about this error so pass
             // through

addin/cmake/DependencyConanFiles.cmake

@@ -63,7 +63,7 @@ if(MSVC)
 else()
 	set(CONAN_CURPLATFORM_LIB_NAMES
 			#mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
-			zlib/1.2.11@LR04.02_ThirdParty/stable
+			#zlib/1.2.11@LR04.02_ThirdParty/stable
 			#mod_download mod_evtconverter mod_ThermalPrint
 			expat/2.1.0@LR04.02_ThirdParty/testing
 			#mod_ThermalPrint mod_evtconverter mod_download