Bladeren bron

Z991239-6390 #comment 添加TODO标记

80374374 2 maanden geleden
bovenliggende
commit
77073d0f1a
50 gewijzigde bestanden met toevoegingen van 149 en 130 verwijderingen
  1. 1 1
      Framework/Common/PlatformDef.h
  2. 4 3
      Framework/Common/SpBase.h
  3. 3 3
      Framework/Common/precompile.h
  4. 0 1
      Framework/RvcLogSdk/log_inner_include.h
  5. 0 2
      Framework/spbase/SpBase.cpp
  6. 1 0
      Framework/spbase/SpSecureClient.cpp
  7. 0 13
      Framework/spbase/sp_cfg.cpp
  8. 1 1
      Framework/spshell/spshell.cpp
  9. 8 2
      Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp
  10. 2 2
      Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp
  11. 2 0
      Module/mod_ContactlessCard/ContactlessFSM.cpp
  12. 0 5
      Module/mod_ContactlessCard/ContactlessFSM.h
  13. 0 1
      Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp
  14. 2 3
      Module/mod_FingerPrint/FingerPrintFSM.cpp
  15. 0 1
      Module/mod_IDCertificate/IDCertFSM.cpp
  16. 1 1
      Module/mod_ResourceWatcher/CMakeLists.txt
  17. 0 7
      Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp
  18. 1 9
      Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp
  19. 6 1
      Module/mod_SalesRecorder/mod_SalesRecorder.cpp
  20. 1 1
      Module/mod_SalesRecorder/mod_SalesRecorder.h
  21. 30 3
      Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp
  22. 2 2
      Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp
  23. 0 1
      Module/mod_accessauth/AccessAuthConn.cpp
  24. 8 3
      Module/mod_accessauth/AccessAuthFSM.cpp
  25. 1 0
      Module/mod_accessauth/AccessAuthFSM.h
  26. 5 1
      Module/mod_accessauth/CMakeLists.txt
  27. 2 2
      Module/mod_accessauth/mod_AccessAuth.cpp
  28. 0 3
      Module/mod_accessauth/mod_AccessAuth.h
  29. 5 2
      Module/mod_alarm/mod_alarm.cpp
  30. 7 2
      Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp
  31. 1 0
      Module/mod_counterconnector/ConnectorFSM.h
  32. 1 1
      Module/mod_facetracking/mod_facetracking.cpp
  33. 0 28
      Module/mod_healthmanager/mod_healthmanager.cpp
  34. 8 4
      Module/mod_heartbeat/HeartBeatFSM.cpp
  35. 3 4
      Module/mod_heartbeat/HeartBeatFSM.h
  36. 3 2
      Module/mod_localmediaplay/AdvertManage/BaseFun.cpp
  37. 1 1
      Module/mod_localmediaplay/AdvertManage/MediaManage.cpp
  38. 8 0
      Module/mod_localmediaplay/AdvertManage/resourceIniParse.cpp
  39. 0 2
      Module/mod_localmediaplay/AdvertManage/resourceIniParse.h
  40. 6 2
      Module/mod_localmediaplay/mod_localmediaplay.cpp
  41. 0 4
      Module/mod_localmediaplay/mod_localmediaplay.h
  42. 1 1
      Module/mod_mediacontroller/capture.cpp
  43. 4 0
      Module/mod_mediacontroller/mod_mediacontroller.cpp
  44. 7 1
      Module/mod_recorder/mod_recorder.cpp
  45. 1 0
      Module/mod_screenshot/mod_screenshot.cpp
  46. 1 0
      Module/mod_sipphone/CMakeLists.txt
  47. 2 0
      Module/mod_sipphone/mod_sipphone.cpp
  48. 0 1
      Module/mod_sipphone/unix/video_session.cpp
  49. 8 2
      Module/mod_upload/UploadFSM.cpp
  50. 1 1
      Module/mod_vtmloader/VtmLoaderFSM.cpp

+ 1 - 1
Framework/Common/PlatformDef.h

@@ -55,7 +55,7 @@
 #elif defined(__GNUC__) || defined(__clang__)
 	#define RVC_ATTR_UNUSED __attribute__((unused))
 #else
-	#define RVC_ATTR_UNUSED /** @since version 3.12.0 */
+	#define RVC_ATTR_UNUSED
 #endif
 
 #define RVC_UNUSED(x) (void)(x)

+ 4 - 3
Framework/Common/SpBase.h

@@ -35,9 +35,9 @@
 
 
 #ifdef RVC_OS_WIN
-#ifndef u__int64_t
-#define u__int64_t unsigned __int64
-#endif //u__int64_t
+	#ifndef u__int64_t
+		#define u__int64_t unsigned __int64
+	#endif //u__int64_t
 #endif
 
 #include <time.h> // for time_t
@@ -1713,6 +1713,7 @@ SPBASE_API void SpGetToken(char* channelId, char* token, char* terminalno, char*
 	LogTrace(CSimpleStringA::Format(pMsg, ##__VA_ARGS__), _GetFileName(__FILE__), __LINE__)
 #endif //RVC_OS_WIN
 
+//TODO: to remove  [Gifur@2025730]
 extern "C" SPBASE_API void Dbg(const char *str, ...);
 extern "C" SPBASE_API void vDbg(const char *str, va_list list);
 

+ 3 - 3
Framework/Common/precompile.h

@@ -49,9 +49,9 @@
 #endif //SPABASE_LINKED_AS_STATIC_LIBRARY
 
 #ifdef RVC_OS_WIN
-#ifndef u__int64_t
-#define u__int64_t unsigned __int64
-#endif //u__int64_t
+	#ifndef u__int64_t
+		#define u__int64_t unsigned __int64
+	#endif //u__int64_t
 #endif //RVC_OS_WIN
 
 #ifndef SPBASE_TAG

+ 0 - 1
Framework/RvcLogSdk/log_inner_include.h

@@ -105,7 +105,6 @@ typedef int BOOL;
 
 #define Sleep(param) usleep(1000*(param))
 #define strcpy_s(a, b, c) strcpy(a, c)
-#define sprintf_s(a, b, c) sprintf(a, c)
 #define strncpy_s(a, b, c, d) strncpy(a, c, d)
 #define vsprintf_s(a, b, c, d) vsprintf(a, c, d)
 #define _strdup strdup

+ 0 - 2
Framework/spbase/SpBase.cpp

@@ -28,8 +28,6 @@
 
 #ifdef RVC_OS_WIN
 #include "sp_checkEntity.h"
-
-#pragma comment(lib, "dbghelp.lib")
 #include <DbgHelp.h>
 #else
 #include <exception>

+ 1 - 0
Framework/spbase/SpSecureClient.cpp

@@ -816,6 +816,7 @@ bool SpSecureClient::OnAuthRequestSM(CConnAuthSMReq* pReq)
 	strncpy(info.m_arrTerminalNo, (LPCSTR)si.strTerminalID, sizeof(info.m_arrTerminalNo) - 1);
 	strcpy(info.m_arrServiceType, "CMBRVC");
 	{
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_LINUX
         char buf[512];
         toolkit_interface_address_t* addr;

+ 0 - 13
Framework/spbase/sp_cfg.cpp

@@ -588,12 +588,7 @@ SPBASE_API int sp_cfg_getVer(char *ver)
 
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("read active.txt, version[%s]", s_terminalVer.GetData());
 	}
-	
-#ifdef RVC_OS_LINUX
-	sprintf(ver, "%s", s_terminalVer.GetData());
-#else
 	sprintf_s(ver, SP_MAX_VER_LEN, "%s", s_terminalVer.GetData());
-#endif
 	return Error_Succeed;
 }
 
@@ -729,11 +724,7 @@ int sp_tryReadFromCacheConfig(int cfgType, const char* section, const char* key,
 		return ErrorCodeEnum::Error_NoDefine;
 	else
 	{
-#ifdef RVC_OS_LINUX
-		sprintf(dst, "%s", curSection[key].c_str());
-#else
 		sprintf_s(dst, max_len, "%s", curSection[key].c_str());
-#endif
 		return Error_Succeed;
 	}
 }
@@ -779,11 +770,7 @@ int sp_tryReadFromCenterSetting(const char* section, const char* key, char *dst,
 		return ErrorCodeEnum::Error_NoDefine;
 	else
 	{
-#ifdef RVC_OS_LINUX
-		sprintf(dst, "%s", curSection[key].c_str());
-#else
 		sprintf_s(dst, max_len, "%s", curSection[key].c_str());
-#endif
 		return Error_Succeed;
 	}
 }

+ 1 - 1
Framework/spshell/spshell.cpp

@@ -24,7 +24,6 @@
 
 #ifdef RVC_OS_WIN
 #include <io.h>
-#pragma comment(lib, "dbghelp.lib")
 #include "sp_firewallControl.h"
 #else
 #include <unistd.h>
@@ -375,6 +374,7 @@ const char *GetMachineType()
 
 #ifdef RVC_OS_WIN
 
+//TODO: CrossPlaform  [Gifur@2025730]
 const char *GetCenterSettingNameBySite(const char *pszSite)
 {
 	///*TODO(80374374@3/23/2023): CenterSettings */

+ 8 - 2
Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -9,7 +9,6 @@
 #include "CardIssuerStand_msg_g.h"
 
 #include "publicFunExport.h"
-#pragma comment(lib, "libpublicFun.lib")
 #include <algorithm>
 #include <map>
 #ifdef RVC_OS_WIN
@@ -22,7 +21,7 @@
 #include "stdafx.h"
 #include <regex>
 
-//oiltest@20200915 temp for GetTickCount
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #else
@@ -1557,6 +1556,7 @@ bool CCardIssuerFSM::LoadCMBPrint(CSimpleStringA csBinPath)
 {
 	if (cmdDecodeEx == NULL) {
 		CSimpleStringA csCMBPrint("");
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_LINUX
 		csCMBPrint = "libCMBPrint.so";
 		csCMBPrint = csBinPath + "/" + csCMBPrint;
@@ -4671,6 +4671,8 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 	qTempReq.m_url = m_csSyncMaterialUrl.GetData();
 	qTempReq.m_headers.emplace(std::make_pair("Content-Type", "application/json"));
 	SyncMaterialCountReq1& req1 = qTempReq.reqInfo;
+
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	strncpy_s(req1.TerminalNo, sizeof(req1.TerminalNo), info.strTerminalID, _TRUNCATE);
 	strncpy_s(req1.DeviceNo, sizeof(req1.DeviceNo), syncInfo.strDeviceNo, _TRUNCATE);
@@ -4688,6 +4690,8 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 		pReq2.bMaintain = syncInfo.arrMaintainFlag[i];
 		if (syncInfo.arrMaintainFlag[i])
 		{
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN		
 			strncpy_s(pReq2.Maintainer, sizeof(pReq2.Maintainer), syncInfo.arrMaintainer[i], _TRUNCATE);
 #else
@@ -4695,6 +4699,8 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 #endif //RVC_OS_WIN
 			pReq2.MaintainTime = syncInfo.arrMaintainTime[i];
 		}
+
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strncpy_s(pReq2.CardBoxNo, sizeof(pReq2.CardBoxNo), syncInfo.arrCardBoxNo[i], _TRUNCATE);
 		strncpy_s(pReq2.PsbCode, sizeof(pReq2.PsbCode), syncInfo.arrPsbCode[i], _TRUNCATE);

+ 2 - 2
Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -6,11 +6,11 @@
 #include <algorithm>
 #include <map>
 using namespace std;
-//CSimpleStringA<T> ambigulous
 #define _ATL_NO_AUTOMATIC_NAMESPACE
-//#include <atltime.h>
 #define ReadCard_TIMEOUT	62000	//web的超时时间是65s
 #define ReadCard_Min_Time	12000	//Read+PreOnline 
+
+//TODO: CrossPlaform  [Gifur@2025730]
 unsigned long long GetTickCountRVC() {
 #ifdef RVC_OS_WIN
 	return GetTickCount64();

+ 2 - 0
Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -1509,6 +1509,8 @@ bool CContactlessCardFSM::LoadCMBPrint(CSimpleStringA csBinPath)
 {
 	if (cmdDecodeEx == NULL) {
 		CSimpleStringA csCMBPrint("");
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		csCMBPrint = "CMBPrint.dll";
 		csCMBPrint = csBinPath + SPLIT_SLASH_STR + csCMBPrint;

+ 0 - 5
Module/mod_ContactlessCard/ContactlessFSM.h

@@ -49,13 +49,8 @@ enum EvtType
 };
 
 using namespace ContactlessCard;
-#ifdef RVC_OS_WIN
-typedef int(*lpCMBdecodeMag2)(char* Mag2Data, char * data);
-typedef int(*lpCMBdecodeEx)( char* MagData, char * type, char * data);
-#else
 using lpCMBdecodeMag2 = int(*)(char* mag2Data, char* data);
 using lpCMBdecodeEx = int(*)(char* magData, char* type, char* data);
-#endif
 
 class CContactlessCardEntity;
 class CContactlessCardFSM;

+ 0 - 1
Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -18,7 +18,6 @@
 
 using namespace std;
 #else
-#include "fileutil.h"
 #include <memory>
 #include <thread>
 #include <chrono>

+ 2 - 3
Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -24,9 +24,6 @@
 #define MAX_FEATURE_LEN 1024
 #define STANDARD_FEATURE_LEN 684
 
-
-
-
 void CFingerPrintFSM::s0_on_entry()
 {
 	LOG_FUNCTION();
@@ -868,6 +865,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::Image2Feature").setCostTime(l_endTime - l_beginTime)("GetFingerPrint::Image2Feature succ ,fileName:%s, lpbLength:%d", fileName.GetData(), lpbLength);
 			Sleep(200);//save image may be delayed some time, not must happen
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 
 			//TODO: CrossPlaform  [Gifur@2025728]
@@ -1095,6 +1093,7 @@ int CFingerPrintFSM::GenerateTemplate(SpReqAnsContext<FingerPrintService_Generat
 
 ErrorCodeEnum CFingerPrintFSM::GetDevCatInfo(DevCategoryInfo& devInfo)
 {
+	//TODO: CrossPlaform  [Gifur@2025730]
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("DevCatgoryInfo len:%d, %d, %d", strlen(m_devCatInfo.szModel), strlen(m_devCatInfo.szType), strlen(m_devCatInfo.szVendor));
 #ifdef RVC_OS_WIN
 	strncpy_s(devInfo.szModel, m_devCatInfo.szModel, (MAX_DEV_MODEL_LEN > strlen(m_devCatInfo.szModel)) ? strlen(m_devCatInfo.szModel) : MAX_DEV_MODEL_LEN-1);

+ 0 - 1
Module/mod_IDCertificate/IDCertFSM.cpp

@@ -21,7 +21,6 @@ using namespace SP::Module::Comm;
 #include "json/json.h" 
 #include <Windows.h>
 #include <unordered_map>
-#pragma comment(lib,"user32.lib")
 #endif // RVC_OS_LINUX
 
 #define IDCER_INIT_COUNT 3

+ 1 - 1
Module/mod_ResourceWatcher/CMakeLists.txt

@@ -44,7 +44,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 if(MSVC)
     set(${MODULE_PREFIX}_LIBS RestfulFunc)
-    set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ws2_32 mbnapi_uuid pdh winmm shell32 Wintrust crypt32 wlanapi mbnapi_uuid Gdi32 User32)
+    set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ws2_32 mbnapi_uuid pdh winmm shell32 Wintrust crypt32 wlanapi mbnapi_uuid Gdi32 User32 WtsApi32)
 else()
     target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_SOGOULIB})
     set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} libpublicFun RestfulFunc ${CONAN_LIBS_SOGOULIB})

+ 0 - 7
Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -45,15 +45,8 @@
 #include <tlhelp32.h>
 #include <WtsApi32.h>
 #include <sysinfoapi.h>
-#pragma comment(lib, "WtsApi32.lib")
 #include "Mmdeviceapi.h"
 #include "Propidl.h"
-#pragma comment(lib, "pdh.lib")
-#pragma comment(lib,"winmm.lib" )
-#pragma comment(lib, "shell32.lib")
-#pragma comment(lib, "Wintrust.lib")   
-#pragma comment(lib, "crypt32.lib")
-#pragma comment(lib, "wlanapi.lib")
 #endif
 
 #ifdef RVC_OS_LINUX

+ 1 - 9
Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -38,14 +38,6 @@
 #include "mod_ResourceWatcher.h"
 #include "ResourceWatcher_UserCode.h"
 
-#ifdef RVC_OS_WIN
-#pragma comment(lib, "shell32.lib")
-#pragma comment(lib, "Wintrust.lib")   
-#pragma comment(lib, "crypt32.lib")
-#pragma comment(lib, "Gdi32.lib")
-#pragma comment(lib, "User32.lib")
-#endif // RVC_OS_WIN
-
 using namespace HealthManager;
 
 void ResourceWatcherServiceSession::Handle_GetDevInfo(
@@ -435,7 +427,7 @@ ErrorCodeEnum SetFileExecutePriviledge(LPCTSTR lpcszDirOrFilePath)
 #endif //RVC_OS_WIN
     return result;
 }
-
+//TODO: CrossPlaform  [Gifur@2025730]
 static int IsFileExists(const char* pfilename)
 {
     int iRet = -1;

+ 6 - 1
Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -93,6 +93,7 @@ static void CStringSplit(char* str, char** result, const char* del)
 {
 	char* pdata = NULL;
 	char* p = NULL;
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	p = strtok_s(str, del, &pdata);
 #else
@@ -116,6 +117,7 @@ static bool rvcMoveFile(const char* strSrcFile, const char* strDstFile)
 	if (NULL == strSrcFile || NULL == strDstFile) {
 		return bRet;
 	}
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	bRet = MoveFile(strSrcFile, strDstFile);
 #else
@@ -265,7 +267,7 @@ static CSimpleStringA DecryptString(const char* lpszEncrpyted)
 	return CSimpleStringA((LPCTSTR)csPlainTxt);
 }
 
-
+//TODO: CrossPlaform  [Gifur@2025730]
 static unsigned long GetFileSize(const char* pfilename)
 {
 #ifdef RVC_OS_WIN
@@ -867,6 +869,7 @@ ErrorCodeEnum CSalesRecorderEntity::DeleteVideo( const char *videofilename)
 					bRet = RvcDeleteFile(fileName.GetData());
 					if(!bRet) {
 						bDeleteSucc = false;
+						//TODO: CrossPlaform  [Gifur@2025730]
 					#ifdef RVC_OS_WIN
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Error Code %lu while delete %s ", GetLastError(), fileName.GetData());
 					#else
@@ -1655,6 +1658,7 @@ int CSalesRecorderEntity::HandleEncryptVideoRecord(const char* videofilename)
 
 	bool bRet = RvcDeleteFile(videofilename);
 	if (!bRet) {
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SALESRECORD_DELETE_FAILED, CSimpleStringA::Format("Error Code %lu while delete %s, delete out temp file[%s]!", GetLastError(), videofilename, strOutFile).GetData());
 #else
@@ -1671,6 +1675,7 @@ int CSalesRecorderEntity::HandleEncryptVideoRecord(const char* videofilename)
 			iRet = 0;
 		}
 		else {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SALESRECORD_RENAME_FAILED, CSimpleStringA::Format("Error Code %lu while rename %s.", GetLastError(), strOutFile).GetData());
 #else

+ 1 - 1
Module/mod_SalesRecorder/mod_SalesRecorder.h

@@ -34,7 +34,7 @@ namespace SalesRecorder {
 		char Reserved2[128];
 	} RecordSubTitle;
 
-
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	class CSalesRecorderEntity : public CEntityBase, public CHostApi, public ILogListener,public ISysVarListener, public ITimerListener
 	{

+ 30 - 3
Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1430,6 +1430,7 @@ namespace Task
 								if(remove(dPackPath)==0){
 									DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("delete download old pack succ ", dPackPath);
 									if(rename(dPackPathTemp.GetData(),dPackPath)!=0){
+										//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 										errMsg = CSimpleStringA::Format("exist old file,remove temp file fail, error=%d",(int)GetLastError()).GetData();
 #else
@@ -1443,6 +1444,7 @@ namespace Task
 										return 1;//成功返回
 									}
 								}else{
+									//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 									errMsg = CSimpleStringA::Format("delete download old pack fail ,error:%d",(int)GetLastError()).GetData();
 #else
@@ -1454,6 +1456,7 @@ namespace Task
 								}
 							}else{
 								if(rename(dPackPathTemp.GetData(),dPackPath)!=0){
+									//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 									errMsg = CSimpleStringA::Format("not exist old file,remove temp file fail, error=%d",(int)GetLastError()).GetData();
 #else
@@ -1474,6 +1477,7 @@ namespace Task
 							if(remove(dPackPathTemp.GetData())==0){
 								DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("delete download temp pack succ ,%s", dPackPathTemp.GetData());
 							}else{
+								//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN							
 								DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("delete download temp pack fail ,%s  error:%d", dPackPathTemp.GetData(), GetLastError());
 #else
@@ -1779,6 +1783,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSim
 	{
 		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("new version dir [%s] already exist, delete it", strNewVerPath.GetData());
 		if(!RemoveDirRecursiveA(strNewVerPath.GetData())){
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Create new version fail, delete already exist new version is fail:%d",GetLastError());
 			strErrInfo = CSimpleStringA::Format("Create new version fail, delete already exist new version is fail:%d",(int)GetLastError());
@@ -1792,6 +1797,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSim
 
 	if (!CreateDirA(strNewVerPath.GetData(), TRUE))
 	{
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Create new version dir fail: %d", GetLastError());
 		strErrInfo = CSimpleStringA::Format("create new version dir fail: %d", (int)GetLastError());
@@ -1917,6 +1923,7 @@ ErrorCodeEnum CUpgradeTaskFSM::ClearUpgradeFailVersion(CVersion NewSoftwareVersi
 	if (ExistsDirA(strNewVerPath.GetData()))
 	{
 		if(!RemoveDirRecursiveA(strNewVerPath.GetData())){
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ClearUpgradeFailVersion fail, delete temp Version [%s] is fail:%d",strNewVerPath.GetData(),(int)GetLastError());
 #else
@@ -1974,6 +1981,7 @@ bool CUpgradeTaskFSM::GetSysUpgradeResult(const char *pszResultLog, CSimpleStrin
 		auto arr2 = arr[i].Split('=');
 		if (arr2.GetCount() == 2)
 		{
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			if (stricmp(arr2[0], "result") == 0)
 				eErrorCode = arr2[1];
@@ -2194,6 +2202,7 @@ int CUpgradeTaskFSM::ExecRunCmd(CSimpleStringA &strErrMsg,CInstallStep* ins)
 		}
 #endif
 		if(ret!=0){
+			//TODO: CrossPlaform  [Gifur@2025730]
 			//程序执行异常,结果未知
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ExecRunCmd is fail, system_on exec unknown ,err=%s",err.GetData());
@@ -2208,6 +2217,7 @@ int CUpgradeTaskFSM::ExecRunCmd(CSimpleStringA &strErrMsg,CInstallStep* ins)
 		}else{
 			//进一步看返回结果文件判断是否成功
 			CSimpleStringA strUnzipPath = GetFileDirectory(destPath.GetData());
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			CSimpleStringA strResultLog = strUnzipPath + "\\result.log";//结果文件
 #else
@@ -2227,6 +2237,7 @@ int CUpgradeTaskFSM::ExecRunCmd(CSimpleStringA &strErrMsg,CInstallStep* ins)
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ExecRunCmd is succ,[%s] ", destPath.GetData());
 				return 1;//成功
 			}else{
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ExecRunCmd is fail,errorCode = %s", eErrorCode.GetData());
 				strErrMsg = CSimpleStringA::Format("ExecRunCmd is fail,errorCode = %s", eErrorCode.GetData());
@@ -2656,6 +2667,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CopyFileOperate(const char* srcPath, const char*
 	case 1:
 		{
 		if (bDestFileExists) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			bRet = CopyFileA(srcPath, destPath, FALSE);
 #else
@@ -2675,6 +2687,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CopyFileOperate(const char* srcPath, const char*
 	case 2:
 		{
 			if (!bDestFileExists)
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				bRet = CopyFileA(srcPath, destPath, TRUE);
 #else
@@ -2690,6 +2703,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CopyFileOperate(const char* srcPath, const char*
 		}
 		break;
 	case 3:
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		bRet = CopyFileA(srcPath, destPath, FALSE);
 #else
@@ -2715,6 +2729,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CopyFileOperate(const char* srcPath, const char*
 	if (bRet){
 		RemoveFileReadOnlyAttributeA(destPath);
 	}else{
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strErrMsg = CSimpleStringA::Format("CopyFileOperate copy file fail:%d", GetLastError());
 #else
@@ -2739,6 +2754,7 @@ ErrorCodeEnum CUpgradeTaskFSM::SetRunSucceed(const char* pPackFile)
 	}
 	CSimpleStringA strSourcePath = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s", (const char*)strDownloadPath, pPackFile);
 	CSimpleStringA strDestPath = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s", (const char*)strUpgradedPath, pPackFile);
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	CopyFileA(strSourcePath.GetData(), strDestPath.GetData(), FALSE);
 #else
@@ -3141,7 +3157,7 @@ bool CUpgradeTaskFSM::IsFileMatch(const char *pszFilter, const char *pszFileName
 }
 
 bool CUpgradeTaskFSM::RecursiveCopyDir(const char *pszSourceDir, const char *pszDestDir,CSimpleStringA &strErrInfo)
-{
+{//TODO: CrossPlaform  [Gifur@2025730]
 	array_header_t *arr;
 #ifdef RVC_OS_WIN
 	if (!ExistsDirA(pszSourceDir))
@@ -3194,7 +3210,7 @@ bool CUpgradeTaskFSM::RecursiveCopyDir(const char *pszSourceDir, const char *psz
 			if (szDestFile[strlen(szDestFile) - 1] != SPLIT_SLASH)
 				strcat(szDestFile, SPLIT_SLASH_STR);
 			strcat(szDestFile, strrchr(file, SPLIT_SLASH) + 1);
-
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			if (!CopyFileA(file, szDestFile, FALSE))
 			{
@@ -3231,6 +3247,7 @@ bool CUpgradeTaskFSM::RecursiveCopyDir(const char *pszSourceDir, const char *psz
 
 			if (!RecursiveCopyDir(dir, szDestSubDir,strErrInfo))
 			{
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("copy dir [%s] fail: %d", dir, GetLastError());
 				if(strErrInfo.IsNullOrEmpty()){
@@ -3551,6 +3568,7 @@ ErrorCodeEnum CUpgradeTaskFSM::DeleteUnzipDir()
 	if (ExistsDirA(strUnzipDir.GetData()))
 	{
 		if(!RemoveDirRecursiveA(strUnzipDir.GetData())){
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN		
 			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("DeleteUnzipDir fail , temp unzip dir [%s] fail,err=%d",strUnzipDir.GetData(),(int)GetLastError());
 #else
@@ -4032,7 +4050,7 @@ ErrorCodeEnum CUpgradeTaskFSM::loadCenterCfgInfo()
 	}
 	return Error_Succeed;
 }
-
+//TODO: CrossPlaform  [Gifur@2025730]
 bool CUpgradeTaskFSM::GetFileLength(const char* filePath,long &fileLen)
 {
 	FILE* file = fopen(filePath, "rb");  
@@ -4710,6 +4728,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewDepVersion(CSimpleStringA NewSoftwareVer
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("new version dir [%s] already exist, delete it", strNewVerPath.GetData());
 		if (!RemoveDirRecursiveA(strNewVerPath.GetData())) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Create new dep version fail, delete already exist new dep version is fail:%d", GetLastError());
 			strErrInfo = CSimpleStringA::Format("Create new dep version fail, delete already exist new dep version is fail:%d", (int)GetLastError());
@@ -4723,6 +4742,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewDepVersion(CSimpleStringA NewSoftwareVer
 
 	if (!CreateDirA(strNewVerPath.GetData(), TRUE))
 	{
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Create new dep version dir fail: %d", GetLastError());
 		strErrInfo = CSimpleStringA::Format("create new dep version dir fail: %d", (int)GetLastError());
@@ -4807,6 +4827,7 @@ ErrorCodeEnum CUpgradeTaskFSM::ClearUpgradeFailDepVersion(CSimpleStringA NewSoft
 	if (ExistsDirA(strNewVerPath.GetData()))
 	{
 		if (!RemoveDirRecursiveA(strNewVerPath.GetData())) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ClearUpgradeFailDepVersion fail, delete temp Version [%s] is fail:%d", strNewVerPath.GetData(), (int)GetLastError());
 #else
@@ -5071,6 +5092,7 @@ int CUpgradeTaskFSM::ExecDepRunCmd(CSimpleStringA& strErrMsg, CInstallStep* ins)
 #endif
 		if (ret != 0) {
 			//程序执行异常,结果未知
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ExecRunCmd is fail, system_on exec unknown ,err=%s", err.GetData());
 			strErrMsg = CSimpleStringA::Format("ExecRunCmd is fail, system_on exec unknown ,err=%s", err.GetData());
@@ -5085,6 +5107,7 @@ int CUpgradeTaskFSM::ExecDepRunCmd(CSimpleStringA& strErrMsg, CInstallStep* ins)
 		else {
 			//进一步看返回结果文件判断是否成功
 			CSimpleStringA strUnzipPath = GetFileDirectory(destPath.GetData());
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			CSimpleStringA strResultLog = strUnzipPath + "\\result.log";//结果文件
 #else
@@ -5105,6 +5128,7 @@ int CUpgradeTaskFSM::ExecDepRunCmd(CSimpleStringA& strErrMsg, CInstallStep* ins)
 				return 1;//成功
 			}
 			else {
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ExecRunCmd is fail,errorCode = %s", eErrorCode.GetData());
 				strErrMsg = CSimpleStringA::Format("ExecRunCmd is fail,errorCode = %s", eErrorCode.GetData());
@@ -5720,6 +5744,7 @@ bool CUpgradeTaskFSM::DownloadFileWrite(byte* content,long contentLen,const char
 	fclose(tempFp);
 
 	if(ret!=1){
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("DownloadFileWrite write file fail,ret = %d,errno = %d",ret,(int)GetLastError());
 		return false;
@@ -5990,6 +6015,7 @@ bool CUpgradeTaskFSM::isWork()
 	if((!m_currentTask.NewVersion.IsNullOrEmpty())&&(m_currentTask.cPendingState=="T"||m_currentTask.cPendingState=="C"||m_currentTask.cPendingState=="X")){
 		CSimpleStringA strRunInfo,strStartTime;
 		if (m_pEntity->GetFunction()->GetPath("RunInfo",strRunInfo) == Error_Succeed){
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			strStartTime = strRunInfo + "\\runcfg\\starttime.dat";
 #else
@@ -5998,6 +6024,7 @@ bool CUpgradeTaskFSM::isWork()
 			if(!ExistsFileA(strStartTime.GetData())){
 				return true;//完成升级过程,通过
 			}else{
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("upgrade process is not end ,file \\runcfg\\starttime is exist");
 #else

+ 2 - 2
Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -10,13 +10,12 @@
 
 #ifdef RVC_OS_WIN
 #include <io.h>
-#include "EventCode.h"
 #else
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
-#include "EventCode.h"
 #endif
+#include "EventCode.h"
 #include "json/json.h"
 
 namespace Task
@@ -494,6 +493,7 @@ ErrorCodeEnum CUpgradeMgrEntity::testActive()
 	//TODO: CrossPlaform  [Gifur@2025729]
 	FILE* fp = fopen(strActiveFile.GetData(),"rb+");
 	if(fp==NULL){
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		LogWarn(Severity_Middle, Error_Exception, ERR_WRAN_OPEN_ACTIVE_FAIL,CSimpleStringA::Format("open write active.txt fail,please edit active attribute, err=%d",(int)GetLastError()).GetData());
 #else

+ 0 - 1
Module/mod_accessauth/AccessAuthConn.cpp

@@ -3,7 +3,6 @@
 #include "mod_AccessAuth.h"
 #include "access_basefun.h"
 #ifdef RVC_OS_WIN
-#pragma comment(lib, "crypt32.lib")
 #include <windows.h>
 #include <Wincrypt.h>
 #include "MyBase64.h"

+ 8 - 3
Module/mod_accessauth/AccessAuthFSM.cpp

@@ -27,11 +27,10 @@ using namespace PinPad;
 #include <WinCrypt.h>
 #include <Strsafe.h>
 #include "DeviceBaseClass.h"
-#pragma comment(lib, "IPHLPAPI.lib")
 #define ALLOW_MULTI_NETWORKD_CARDS
 #endif // RVC_OS_WIN
 
-//TODO: rm  [Gifur@2025725]
+//TODO: CrossPlaform  [Gifur@2025730]
 int HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len)
 {
 	char* tmpStr = *strBuf;
@@ -43,7 +42,7 @@ int HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len)
 	return 0;
 }
 
-//TODO: rm  [Gifur@2025725]
+//TODO: CrossPlaform  [Gifur@2025730]
 int StrBuf2HexBuf(LPCTSTR strBuf, PBYTE* hexBuf)
 {
 	int len = strlen(strBuf);
@@ -853,8 +852,14 @@ DWORD CAccessAuthFSM::GetEncTerminalInfoWithKey(CBlob& encInfo, BYTE* key)
 		doWarnMsg(ERR_ACCESSAUTH_ENCRYPT_KEY,
 			GetOutPutStr("%s%08X", "CryptEncrypt", rc).c_str());
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(GetOutPutStr("%s%08X", "CryptEncrypt", rc).c_str());
+
+		delete[] pBuf;
+
 		return ERR_ACCESSAUTH_ENCRYPT_KEY;
 	}
+
+	delete[] pBuf;
+
 	return Error_Succeed;
 }
 

+ 1 - 0
Module/mod_accessauth/AccessAuthFSM.h

@@ -9,6 +9,7 @@
 #include "json/json.h"
 #include "CommEntityRestful.hpp"
 
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 ///*TODO:  (80374374@11/27/2023)*/
 typedef CAutoArray<CSimpleStringA>  NetworkAddressesList;

+ 5 - 1
Module/mod_accessauth/CMakeLists.txt

@@ -47,7 +47,11 @@ target_link_directories(${MODULE_NAME} PRIVATE
 
 # 添加实体需要依赖的其他共享库(包括系统库)
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS})#${CONAN_PKG_LIBS_BOOST} RVCCrypt NewRVCCrypt
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} libpublicFun)
+if(MSVC)
+	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} libpublicFun crypt32 IPHLPAPI)
+else()
+	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} libpublicFun)
+endif(MSVC)
 
 
 

+ 2 - 2
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -24,9 +24,8 @@ using namespace PinPad;
 #include "DeviceBaseClass.h"
 #endif
 
-//TODO: rm  [Gifur@2025725]
+//TODO: CrossPlaform  [Gifur@2025730]
 extern int HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len);
-//TODO: rm  [Gifur@2025725]
 extern int StrBuf2HexBuf(LPCTSTR strBuf, PBYTE* hexBuf);
 
 struct InitializerInitMKTask : ITaskSp
@@ -596,6 +595,7 @@ bool CAccessAuthEntity::GetTerminalPublicKey(BYTE* pBuf, int& nBufLen, string& p
 		return false;
 	}
 	runInfoPath += SPLIT_SLASH_STR "runcfg" SPLIT_SLASH_STR;
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	DWORD dwAttr = GetFileAttributes(runInfoPath.GetData());
 	if (dwAttr == 0xFFFFFFFF)  //目录不存在则创建   

+ 0 - 3
Module/mod_accessauth/mod_AccessAuth.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "SpBase.h"
-#ifdef RVC_OS_WIN
-//#include "RVCCrypt.h"
-#endif // RVC_OS_WIN
 #include "AccessAuthorization_server_g.h"
 using namespace AccessAuthorization;
 

+ 5 - 2
Module/mod_alarm/mod_alarm.cpp

@@ -24,7 +24,7 @@ void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		if (m_fsm.m_CenterModel == 0) {
 			if (!strMessage.IsNullOrEmpty()) {
 				std::string tmpStr = SP::Utility::UTF8ToGBK(pszMessage);
-					strMessage = tmpStr.c_str();
+				strMessage = tmpStr.c_str();
 			}
  		}
 #endif
@@ -58,6 +58,8 @@ void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		char cDescription[512]={0};
 		//char clogTime[32]={0};//2020-20-20 12:12:12.100 日志时间,记得释放
 		char warnTime[20]={0};//2020-20-20 12:12:12 告警时间,记得释放
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		SYSTEMTIME st;
 		GetLocalTime(&st);
@@ -71,7 +73,8 @@ void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		//sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d  ", nowTm.tm_year + 1900, nowTm.tm_mon + 1, nowTm.tm_mday, nowTm.tm_hour, nowTm.tm_min, nowTm.tm_sec, stime.millitm);
 		sprintf(warnTime, "%04d-%02d-%02d %02d:%02d:%02d", nowTm.tm_year + 1900, nowTm.tm_mon + 1, nowTm.tm_mday, nowTm.tm_hour, nowTm.tm_min, nowTm.tm_sec);
 #endif
-		//strncpy(cDescription, clogTime, 32);
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strncat(cDescription, pszMessage, 512 - 1);
 #else

+ 7 - 2
Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -8,7 +8,6 @@
 #include "CardIssuerStore_msg_g.h"
 
 #include "publicFunExport.h"
-#pragma comment(lib, "libpublicFun.lib")
 #include <algorithm>
 #include <map>
 #ifdef RVC_OS_WIN
@@ -21,7 +20,7 @@
 #include "stdafx.h"
 #include <regex>
 
-//oiltest@20200915 temp for GetTickCount
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #else
@@ -1602,6 +1601,8 @@ bool CCardIssuerFSM::LoadCMBPrint(CSimpleStringA csBinPath)
 {
 	if (cmdDecodeEx == NULL) {
 		CSimpleStringA csCMBPrint("");
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_LINUX
 		csCMBPrint = "libCMBPrint.so";
 		csCMBPrint = csBinPath + "/" + csCMBPrint;
@@ -5140,6 +5141,8 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 	qTempReq.m_url = m_csSyncMaterialUrl.GetData();
 	qTempReq.m_headers.emplace(std::make_pair("Content-Type", "application/json"));
 	SyncMaterialCountReq1& req1 = qTempReq.reqInfo;
+
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	strncpy_s(req1.TerminalNo, sizeof(req1.TerminalNo), info.strTerminalID, _TRUNCATE);
 	strncpy_s(req1.DeviceNo, sizeof(req1.DeviceNo), syncInfo.strDeviceNo, _TRUNCATE);
@@ -5157,6 +5160,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 		pReq2.bMaintain = syncInfo.arrMaintainFlag[i];
 		if (syncInfo.arrMaintainFlag[i])
 		{
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			strncpy_s(pReq2.Maintainer, sizeof(pReq2.Maintainer), syncInfo.arrMaintainer[i], _TRUNCATE);
 #else
@@ -5164,6 +5168,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 #endif //RVC_OS_WIN
 			pReq2.MaintainTime = syncInfo.arrMaintainTime[i];
 		}
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strncpy_s(pReq2.CardBoxNo, sizeof(pReq2.CardBoxNo), syncInfo.arrCardBoxNo[i], _TRUNCATE);
 		strncpy_s(pReq2.PsbCode, sizeof(pReq2.PsbCode), syncInfo.arrPsbCode[i], _TRUNCATE);

+ 1 - 0
Module/mod_counterconnector/ConnectorFSM.h

@@ -482,6 +482,7 @@ private:
 	int TranslateState(int innerState);
 	ErrorCodeEnum SetCallState(int state);
 
+	//TODO: CrossPlaform  [Gifur@2025730]
 	void get_format_uuid(char* strbuffer, size_t ulen)
 	{
 #ifdef RVC_OS_WIN

+ 1 - 1
Module/mod_facetracking/mod_facetracking.cpp

@@ -14,7 +14,7 @@
 #ifndef MAX_LOG_LEN
 #define MAX_LOG_LEN 512
 #endif
-
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifndef rvc_snprintf
 #ifdef RVC_OS_WIN
 #define rvc_snprintf _snprintf

+ 0 - 28
Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1422,34 +1422,6 @@ void CHealthManagerEntity::WarnAndRestartFunc(RebootTriggerEnum eTrigger, Reboot
 	m_fsm.QuitFrameworkAndSaveInfo(eTrigger, eWay);
 }
 
-namespace
-{
-
-	ErrorCodeEnum SplitAdapterFileName(CSimpleStringA strFileName, CAutoArray<CSimpleStringA>& values)
-	{
-#ifdef RVC_OS_WIN
-		CSimpleStringA strPrefix("");
-		CSimpleStringA strSuffix(".dll");
-#else
-		CSimpleStringA strPrefix("lib");
-		CSimpleStringA strSuffix(".so");
-#endif //RVC_OS_WIN
-
-		if (strFileName.GetLength() < strPrefix.GetLength() + strSuffix.GetLength()) {
-			return Error_Param;
-		}
-
-		CSimpleStringA pureAdapterName = strFileName.SubString(
-			strPrefix.GetLength(), strFileName.GetLength() - strPrefix.GetLength() - strSuffix.GetLength());
-
-		values = pureAdapterName.Split('.');
-		if (values.GetCount() != 4) {
-			return Error_DataCheck;
-		}
-		return Error_Succeed;
-	}
-}
-
 void CHealthManagerEntity::OnEntityStateHook(const char* pszEntityName, const char* pszTriggerEntity, EntityStateEnum eState, EntityStateEnum eLastState)
 {
 	if (m_fsm.CheckIsRebooting())//oilyang@20250415 no need to process entity state changing event while in rebooting

+ 8 - 4
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -514,6 +514,8 @@ string CHeartBeatFSM::HandShakeJsonStr() {
 	m_pEntity->GetFunction()->GetSysVar("CustomerHandle", customerHandle);
 	m_pEntity->GetFunction()->GetSysVar("CallState", callState);
 	m_pEntity->GetFunction()->GetSysVar("TerminalStage", termStage);
+
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	char tmp[256];
 	gethostname(tmp, sizeof(tmp));
@@ -896,8 +898,6 @@ ErrorCodeEnum CHeartBeatFSM::GetPerformCounter(TermianlCounter& counter)
 {
 	memset(&counter, 0, sizeof(TermianlCounter));
 #ifdef RVC_OS_WIN
-	//oilyang@20171122 数量太多,暂时去掉
-	//LOG_FUNCTION();
 	PDH_STATUS Status;
 	HQUERY Query = NULL;
 	//HCOUNTER hcMemoryCount;
@@ -906,8 +906,6 @@ ErrorCodeEnum CHeartBeatFSM::GetPerformCounter(TermianlCounter& counter)
 	DWORD CounterType;
 	MEMORYSTATUSEX statex;
 
-	
-
 	Status = PdhOpenQuery(NULL, NULL, &Query);
 	if (Status != ERROR_SUCCESS)
 	{
@@ -1287,6 +1285,8 @@ void HeartBeatConnection::SendCardActive(const int type,const int slot,unsigned
 		m_pEntity->GetFunction()->GetSystemStaticInfo(sysSInfo);
 		req.type = type;
 		req.slot = slot;
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strncpy_s(req.FromTerminalNo, m_TerminalNo.GetData(), m_TerminalNo.GetLength());
 		strncpy_s(req.Account, account, accSize);
@@ -1314,6 +1314,8 @@ void HeartBeatConnection::SendCardActive(const int type,const int slot,unsigned
 		req.findCard = findCard;
 		req.cardPos = cardPos;
 		req.reserved1 = errCSCode;
+
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		strncpy_s(req.FromTerminalNo, m_TerminalNo.GetData(), m_TerminalNo.GetLength());
 		strncpy_s(req.Account, account, accSize);
@@ -1439,6 +1441,7 @@ void CHeartBeatFSM::ProcessPreOnline(CardActiveReq* req)
 		ReceivePreOnlineBack(req->ErrCode, req->Param2, req->findCard, req->cardPos, req->reserved1);
 	}
 #ifdef RVC_OS_WIN
+	/** 特殊处理,很久以前  [Gifur@2025730]*/
 	delete req;
 #endif	
 }
@@ -1469,6 +1472,7 @@ void HeartBeatConnection::PkgRcvProcCardActive(const CSmartPointer<IPackage> &pR
 		else {
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("invalid insreqx packet!");
 		}
+		/** 特殊处理,很久以前  [Gifur@2025730]*/
 #ifdef RVC_OS_WIN
 	//delete pBuf;
 #else

+ 3 - 4
Module/mod_heartbeat/HeartBeatFSM.h

@@ -20,7 +20,6 @@
 #endif //RVC_OS_WIN
 #include "CardReadAdapter_client_g.h"
 #include "CardIssuerStore_client_g.h"
-//#pragma comment(lib, "Loadperf.lib")
 
 #include "SpFSM.h"
 #include "HeartBeat_def_g.h"
@@ -30,9 +29,6 @@ using namespace HeartBeat;
 #include "EventCode.h"
 #include "IHttpFunc.h"
 
-
-
-
 typedef DWORD (__stdcall *LpRestorePerfRegistryFromFile)(LPCWSTR szFileName, LPCWSTR szLangId);
 
 #pragma pack(1)
@@ -40,6 +36,7 @@ typedef DWORD (__stdcall *LpRestorePerfRegistryFromFile)(LPCWSTR szFileName, LPC
 struct HandReq
 {
 	char TerminalNo[16];
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	unsigned long ip;
 #else
@@ -69,6 +66,7 @@ struct HandErrListReq
 //[StructName("HANDANS")]
 struct HandAns
 {
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN	
 	unsigned long EventCode;
 #else
@@ -135,6 +133,7 @@ enum EvtType
 struct TerminalInfo
 {
 	char TerminalNo[16];
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	unsigned long ip;
 #else

+ 3 - 2
Module/mod_localmediaplay/AdvertManage/BaseFun.cpp

@@ -63,7 +63,7 @@ bool checkFileExist(string fileName)
 	}
 }
 
-
+//TODO: CrossPlaform  [Gifur@2025730]
 void Wchar_tToString(std::string& szDst, wchar_t *wchar)
 {
 #ifdef RVC_OS_WIN
@@ -88,7 +88,7 @@ void Wchar_tToString(std::string& szDst, wchar_t *wchar)
 #endif 
 }
 
-// string to wstring
+//TODO: CrossPlaform  [Gifur@2025730]
 void StringToWstring(std::wstring& szDst, std::string str)
 {
 #ifdef RVC_OS_WIN
@@ -114,6 +114,7 @@ void StringToWstring(std::wstring& szDst, std::string str)
 #endif 
 }
 
+//TODO: CrossPlaform  [Gifur@2025730]
 bool createDir(const string &filePath)
 {
 #ifdef RVC_OS_WIN

+ 1 - 1
Module/mod_localmediaplay/AdvertManage/MediaManage.cpp

@@ -42,7 +42,7 @@ int mediaManage::GetPlayListByLocal(vector<ResourceParse>& resourceList)
 {
 	int iNum = 0;
 	resourceList.clear();
-
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	for each (auto i in m_localList)
 	{

+ 8 - 0
Module/mod_localmediaplay/AdvertManage/resourceIniParse.cpp

@@ -15,6 +15,7 @@
 
 int ReadInterger(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, int iDefaultValue)
 {
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	return GetPrivateProfileInt(szSection, szKey, iDefaultValue, szFileName);
 #else
@@ -45,6 +46,7 @@ bool ReadBoolean(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, bool bDef
 string ReadString(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, LPCTSTR strDefaultValue)
 {
 	TCHAR  tempResult[MAX_PATH*2] = {0};
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	GetPrivateProfileString(szSection, szKey, strDefaultValue, tempResult, MAX_PATH * 2, szFileName);
 #else
@@ -71,6 +73,7 @@ void WriteBoolean(LPCTSTR szSection, LPCTSTR szKey, BOOL szBool, LPCTSTR szFileN
 void WriteInt(LPCTSTR szSection, LPCTSTR szKey, int szInt, LPCTSTR szFileName)
 {
 	TCHAR szDefault[MAX_PATH] = { 0 };
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	_stprintf_s(szDefault, _T("%d"), szInt);
 	WritePrivateProfileString(szSection, szKey, szDefault, szFileName);
@@ -83,6 +86,7 @@ void WriteInt(LPCTSTR szSection, LPCTSTR szKey, int szInt, LPCTSTR szFileName)
 
 void WriteString(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szString, LPCTSTR szFileName)
 {
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	WritePrivateProfileString(szSection, szKey, szString, szFileName);
 #else
@@ -109,6 +113,7 @@ bool checkInPlayTime(string playTime, bool checkCurTime)
 	t_beginHour = t_beginMin = t_endHour = t_endMin = 0;
 	try
 	{
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		sscanf_s(playTime.c_str(), "%d:%d-%d:%d", &t_beginHour, &t_beginMin, &t_endHour, &t_endMin);
 #else
@@ -160,6 +165,7 @@ bool checkInVaildTime(string vaildTime, bool checkCurData)
 			//ZeroMemory(&endData, sizeof(tm));
 			if (-1 == i->find('-'))	//单日期
 			{
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				sscanf_s(i->c_str(), "%d/%d/%d", &tempYear, &tempMon, &tempDay);
 #else
@@ -172,6 +178,7 @@ bool checkInVaildTime(string vaildTime, bool checkCurData)
 			}
 			else
 			{
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				sscanf_s(i->c_str(), "%d/%d/%d-%d/%d/%d", &tempYear, &tempMon, &tempDay, &tempYear2, &tempMon2, &tempDay2);
 #else
@@ -230,6 +237,7 @@ bool parseResourceIni(const char* filePath, vector<ResourceParse> &ret)
 	{
 		//get section name
 		TCHAR sectionMedia[30] = STR_NULL;
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		_stprintf_s(sectionMedia, _T("%s%d"), SECTION_MEDIA, i);
 #else

+ 0 - 2
Module/mod_localmediaplay/AdvertManage/resourceIniParse.h

@@ -11,8 +11,6 @@
 #define MAX_PATH 260
 #endif // !MAX_PATH
 
-
-
 using namespace std;
 
 #define HEADINI_NAME		"HeadquartersLocalMediaPlay.ini"

+ 6 - 2
Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -40,7 +40,7 @@ int removeOldTime = 1800;
 #define RVC_VIDEOPLAY_END_TIME "17:30:00"
 #endif // !RVC_VIDEOPLAY_END_TIME
 
-
+//TODO: CrossPlaform  [Gifur@2025730]
 #ifndef rvc_snprintf
 #ifdef RVC_OS_WIN
 #define rvc_snprintf _snprintf
@@ -150,7 +150,7 @@ static void CStringSplit(char* str, char** result, const char* del)
 {
 	char* pdata = NULL;
 	char* p = NULL;
-
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	p = strtok_s(str, del, &pdata);
 #else
@@ -159,6 +159,7 @@ static void CStringSplit(char* str, char** result, const char* del)
 
 	while (p != NULL) {
 		*result++ = p;
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		p = strtok_s(NULL, del, &pdata);
 #else
@@ -1221,6 +1222,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::HandleRemoteRecord(const char* pszMessage)
 				result[i] = const_cast<LPSTR>(arr2[i].GetData());
 			}
 			if (arr1.GetCount() > 4) {
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				_snprintf(strSwiftName, MAX_PATH, "%s", result[4]);
 #else
@@ -1935,6 +1937,7 @@ void CLocalMediaPlayEntity::StartAudio(const char *pAudioNames)
 		const char* d = "|";
 		char* pName = NULL;
 		char* pdata = NULL;
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		pName = strtok_s(strAudios, d, &pdata);
 #else
@@ -1947,6 +1950,7 @@ void CLocalMediaPlayEntity::StartAudio(const char *pAudioNames)
 				LogWarn(Severity_Low, Error_Debug, LOG_EVT_ADV_AUDIO_NOT_EXIST, CSimpleStringA::Format("audio file %s not exist!", strAudioFullPath.GetData()).GetData());
 				return;
 			}
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			pName = strtok_s(NULL, d, &pdata);
 #else

+ 0 - 4
Module/mod_localmediaplay/mod_localmediaplay.h

@@ -3,8 +3,6 @@
 
 #ifdef RVC_OS_WIN
 #include <Shlwapi.h>
-#pragma comment(lib, "ShLwApi.Lib")
-
 #include "libwmpplayer.h"
 #include "libimgplayer.h"
 #else
@@ -23,11 +21,9 @@
 #include <iostream>
 #include <vector>
 
-
 #include "modVer.h"
 #include "EventCode.h"
 
-
 using namespace LocalMediaPlay;
 
 #define MAX_PLAY_CHANNELS					3						//最大播放通道数

+ 1 - 1
Module/mod_mediacontroller/capture.cpp

@@ -106,7 +106,7 @@ static void __audiomgrlog(void* user_data, const char* fmt, va_list arg)
 }
 #endif
 
-
+//TODO: CrossPlaform  [Gifur@2025730]
 static void rvc_sleep(uint32_t umicroseconds) 
 {
 #ifdef RVC_OS_WIN

+ 4 - 0
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -1934,6 +1934,7 @@ ErrorCodeEnum CMediaControllerEntity::ReStartCamera(int nCamera)
 		if((stopcamera(m_capture,nCamera)==-1)){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("restart camera %d, stop camera failed!", nCamera);
 		}
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		Sleep(2000);
 #else
@@ -2440,6 +2441,7 @@ void MediaServiceSession::Handle_GetCameraInfos(SpReqAnsContext<MediaService_Get
 	char strEnvUsbPort[MAX_PATH] = { 0 };
 	char strOptCamera[MAX_PATH] = { 0 };
 	char strOptUsbPort[MAX_PATH] = { 0 };
+	//TODO:   [Gifur@2025730]
 	char cWord = ';';
 
 #ifdef RVC_OS_LINUX
@@ -2487,6 +2489,7 @@ void MediaServiceSession::Handle_ManipulateCameras(SpReqAnsContext<MediaService_
 		LogTransToCMSEvt();
 		if (m_pEntity->m_bStartCamera) {
 			Error = m_pEntity->StopCamerasAndRecord();
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			Sleep(200);
 #else
@@ -2501,6 +2504,7 @@ void MediaServiceSession::Handle_ManipulateCameras(SpReqAnsContext<MediaService_
 		m_pEntity->m_bJsOccupyCamera = true;
 	}
 	else {
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		Sleep(100);
 #else

+ 7 - 1
Module/mod_recorder/mod_recorder.cpp

@@ -44,6 +44,7 @@ using namespace Recorder;
 #define RVC_MIN_RECORD_FILESIZE 1024
 #endif
 
+//TODO: CrossPlaform  [Gifur@2025730]
 static unsigned long GetFileSize(const char* pfilename)
 {
 #ifdef RVC_OS_WIN
@@ -793,6 +794,7 @@ int CRecorderEntity::HandleFinishedVideoRecord(const char* videofilename)
 		LogRecordFileInfo(srcfile.GetData());
 		bRet = rvcMoveFile(srcfile.GetData(), dstfile.GetData());
 		if(!bRet) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("Error Code %u while move %s ", GetLastError(), srcfile.GetData()).GetData());
 #else
@@ -809,6 +811,7 @@ int CRecorderEntity::HandleFinishedVideoRecord(const char* videofilename)
 	if (ExistsFile(srcfile.GetData())){
 		bRet = rvcMoveFile(srcfile.GetData(), dstfile.GetData());
 		if(!bRet) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("Error Code %u while move %s ", GetLastError(), srcfile.GetData()).GetData());
 #else
@@ -852,9 +855,10 @@ int CRecorderEntity::HandleEncryptVideoRecord(const char* videofilename)
 		}
 		return iRet;
 	}
-	
+	//TODO: CrossPlaform  [Gifur@2025730]
 	bool bRet = RvcDeleteFile(videofilename);
 	if(!bRet) {
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_DELETE_FAILED, CSimpleStringA::Format("Error Code %lu while delete %s, delete out temp file[%s]!", GetLastError(), videofilename, strOutFile).GetData());
 #else
@@ -870,6 +874,7 @@ int CRecorderEntity::HandleEncryptVideoRecord(const char* videofilename)
 			iRet = 0;
 		}
 		else{
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_RENAME_FAILED, CSimpleStringA::Format("Error Code %lu while rename %s.", GetLastError(), strOutFile).GetData());
 #else
@@ -916,6 +921,7 @@ int CRecorderEntity::HandleSaveVideoRecord(const char* videofilename)
 		LogRecordFileInfo(srcfile.GetData());
 		bool bRet = rvcMoveFile(srcfile.GetData(), dstfile.GetData());
 		if (!bRet) {
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("Error Code %u while move %s ", GetLastError(), srcfile.GetData()));
 #else

+ 1 - 0
Module/mod_screenshot/mod_screenshot.cpp

@@ -204,6 +204,7 @@ public:
 		int cx, cy;
 		getScreenSize(&cx, &cy);
 #endif
+		//TODO: CrossPlaform  [Gifur@2025730]
 		if (m_bIsWallMachine)
 		{
 			cy = cy-640;

+ 1 - 0
Module/mod_sipphone/CMakeLists.txt

@@ -132,6 +132,7 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 	${CONAN_PKG_LIBS_IPP}
 	${CONAN_PKG_LIBS_SPEEXDSP}
 	ws2_32
+	dbghelp
 	strmiids
 	Vfw32
 	winmm

+ 2 - 0
Module/mod_sipphone/mod_sipphone.cpp

@@ -751,6 +751,7 @@ ErrorCodeEnum CSIPEntity::ConnectAssistChannel()
 void CSIPEntity::HandleHandfreeAudioDeviceErrorEvent()
 {
 	char strNow[MAX_PATH] = { 0 };
+	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	SYSTEMTIME st;
 	GetLocalTime(&st);
@@ -1902,6 +1903,7 @@ void CSIPEntity::OnTimeout(DWORD dwTimerID)
 	else if (RVC_ENTER_HOME_PAGE_TIMER == dwTimerID) {
 		if (m_bFirstLaunched) 
 		{
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			Sleep(2000);
 #else

+ 0 - 1
Module/mod_sipphone/unix/video_session.cpp

@@ -21,7 +21,6 @@
 #include <ipp.h>
 #include <io.h>
 #include <DbgHelp.h>
-#pragma comment(lib, "dbghelp.lib")
 #else
 #include "ivideorenderinterface.h"
 #include "ivideocaptureinterface.h"

+ 8 - 2
Module/mod_upload/UploadFSM.cpp

@@ -625,6 +625,7 @@ namespace Task
 				string destDir="";
 				//根据路径类型组成最后移动路径
 				if(m_fsm->m_currUploadFile->path_type=="R"){
+					//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 					destPath = m_fsm->m_rootPath+"\\"+m_fsm->m_currUploadFile->after_deal_text+"\\"+m_fsm->m_currUploadFile->fileName;
 					destDir = m_fsm->m_rootPath+"\\"+m_fsm->m_currUploadFile->after_deal_text;
@@ -633,6 +634,7 @@ namespace Task
 					destDir = m_fsm->m_rootPath + SPLIT_SLASH_STR + m_fsm->m_currUploadFile->after_deal_text;
 #endif
 				}else{
+					//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 					destPath = m_fsm->m_currUploadFile->after_deal_text+"\\"+m_fsm->m_currUploadFile->fileName;
 #else
@@ -644,6 +646,7 @@ namespace Task
 				//DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("move file %s to %s",srcPath.c_str(),destPath.c_str());
 				//判断是否存在目标文件,如存在,则先删除
 #ifdef RVC_OS_WIN
+				//TODO: CrossPlaform  [Gifur@2025730]
 				if(ExistsFileA(destPath.c_str())){
 					if(remove(destPath.c_str())==0){
 						DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("delete dest file is ok [%s]",destPath.c_str());
@@ -881,6 +884,7 @@ ErrorCodeEnum UploadFSM::OnInit()
 		if(Error_Succeed == Error){
 			if(!runPath.IsNullOrEmpty()){
 				string runPathStr = runPath.GetData();
+				//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 				int pos = runPathStr.find_last_of('\\');
 #else
@@ -1443,6 +1447,7 @@ void UploadFSM::scanFile()
 		//构建初始的扫描根路径
 		string path="";
 		if(up->path_type=="R"){
+			//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 			path = m_rootPath + "\\" + up->path_name;
 #else
@@ -1770,6 +1775,7 @@ bool UploadFSM::getFileContent(FILE* pFile,unsigned char* content,int beginPos,
 	clearerr(pFile);//尝试先复位错误指针
 #endif	
 	if(fseek(pFile,beginPos,SEEK_SET)!=0){
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("getFileContent fail,fseek beginPos =%d is error =%d",beginPos,(int)GetLastError());
 #else
@@ -1794,7 +1800,7 @@ bool UploadFSM::getFileContent(FILE* pFile,unsigned char* content,int beginPos,
 	if(pRemaind==0){
 		return true;
 	}else{
-		
+		//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("getFileContent fail,pRemaind =%d, error=%d",pRemaind,(int)GetLastError());
 #else	
@@ -1832,7 +1838,7 @@ bool UploadFSM::test_zero_ref(const char *path)
 	}
 #endif // RVC_OS_WIN
 }
-
+//TODO: CrossPlaform  [Gifur@2025730]
 bool UploadFSM::GetFileLength(const char* filePath,long &fileLen)
 {
 	FILE* file = fopen(filePath, "rb");  

+ 1 - 1
Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -2958,7 +2958,7 @@ void CVtmLoaderFSM::CopyDepFilesToNewDepPath()
 	csPath = csRun + SPLIT_SLASH_STR + "dep" + SPLIT_SLASH_STR + "0.0.0.1";
 
 	if (!CreateDirA(csPath.GetData(), TRUE))
-	{
+	{//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Create default dep version dir fail: %d", GetLastError());
 #else