Z991239-6443 #comment 媒体小部分的改造

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -10,15 +10,19 @@
 #define MAX_PATH 260
 #endif
 
+#include <winpr/string.h>
+#include <winpr/sysinfo.h>
+
+
 #include "../mod_sipphone/SIPPhone_client_g.h"
 #include "../mod_sipphone/SIPPhone_def_g.h"
-using namespace SIPPhone;
-		
 #include "../mod_SalesRecorder/Event.h"
 #include "../mod_mediacontroller/Event.h"
 #include "../mod_sipphone/Event.h"
 #include "../mod_facetracking/Event.h"
 
+using namespace SIPPhone;
+
 struct CRecvValue
 {
 	int nValue;
@@ -1624,23 +1628,14 @@ void CITCtrlEntity::OnSalesRecordingFailed(const char* pszFailedMsg)
 
 void CITCtrlEntity::OnFaceTrackingMsg(const char* pszFaceTrackingMsg)
 {
-#ifdef DEVOPS_ON_PRD
-#else
+#ifndef DEVOPS_ON_PRD
 	char strTime[MAX_PATH] = { 0 };
 	CSimpleStringA strValue;
 	GetFunction()->GetSysVar("ActiveTrackingCamera", strValue); // E or O
 	CSimpleStringA strMsg = CSimpleStringA::Format("[%s] ", strValue.GetData());
-	//TODO: CrossPlaform  [Gifur@202584]
-#ifdef RVC_OS_WIN
 	SYSTEMTIME nowTime;                             // 系统时间结构体
 	GetLocalTime(&nowTime);
 	_snprintf(strTime, MAX_PATH, "(%02d:%02d:%02d)", nowTime.wHour, nowTime.wMinute, nowTime.wSecond);
-#else
-	struct tm* pst = NULL;
-	time_t t = time(NULL);
-	pst = localtime(&t);
-	snprintf(strTime, MAX_PATH, "(%02d:%02d:%02d)", pst->tm_hour, pst->tm_min, pst->tm_sec);
-#endif // RVC_OS_WIN
 	strMsg += pszFaceTrackingMsg;
 	strMsg += strTime;
 	FaceTrackingMsg evt;

Module/mod_localmediaplay/AdvertManage/BaseFun.cpp

@@ -63,31 +63,6 @@ bool checkFileExist(string fileName)
 	}
 }
 
-//TODO: CrossPlaform  [Gifur@2025730]
-void Wchar_tToString(std::string& szDst, wchar_t *wchar)
-{
-#ifdef RVC_OS_WIN
-	wchar_t* wText = wchar;
-	DWORD dwNum = WideCharToMultiByte(CP_OEMCP, NULL, wText, -1, NULL, 0, NULL, FALSE);// WideCharToMultiByte的运用
-	char* psText; // psText为char*的临时数组，作为赋值给std::string的中间变量
-	psText = new char[dwNum];
-	WideCharToMultiByte(CP_OEMCP, NULL, wText, -1, psText, dwNum, NULL, FALSE);// WideCharToMultiByte的再次运用
-	szDst = psText;// std::string赋值
-	delete[]psText;// psText的清除
-#else
-	std::string curLocale = setlocale(LC_ALL, NULL);        // curLocale = "C";
-	setlocale(LC_ALL, "chs");
-	size_t _Dsize = 2 * wcslen(wchar) + 1;
-	char* _Dest = new char[_Dsize];
-	memset(_Dest, 0, _Dsize);
-	wcstombs(_Dest, wchar, _Dsize);
-	std::string result = _Dest;
-	delete[]_Dest;
-	setlocale(LC_ALL, curLocale.c_str());
-	szDst = result;
-#endif 
-}
-
 //TODO: CrossPlaform  [Gifur@2025730]
 void StringToWstring(std::wstring& szDst, std::string str)
 {

Module/mod_localmediaplay/AdvertManage/BaseFun.h

@@ -16,5 +16,4 @@ bool checkFileExist(string fileName);
 void getDirs(string path, vector<string> &ownname);
 bool createDir(const string &filePath);
 bool removeDir(const string &filePaht);
-void Wchar_tToString(std::string& szDst, wchar_t *wchar);
 void StringToWstring(std::wstring& szDst, std::string str);

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -9,6 +9,7 @@
 #include "../mod_interactivecontrol/Event.h"
 #include "Event.h"
 #include <winpr/string.h>
+#include <winpr/sysinfo.h>
 
 #ifndef RVC_MIN_LOCALPLAYER_TIME
 #define RVC_MIN_LOCALPLAYER_TIME 1
@@ -136,40 +137,14 @@ static bool IsSupportAudioSamprate(int isamprate)
 	return bret;
 }
 
-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
-	p = strtok_r(str, del, &pdata);
-#endif // RVC_OS_WIN
-
-	while (p != NULL) {
-		*result++ = p;
-		//TODO: CrossPlaform  [Gifur@2025730]
-#ifdef RVC_OS_WIN
-		p = strtok_s(NULL, del, &pdata);
-#else
-		p = strtok_r(NULL, del, &pdata);
-#endif
-	}
-}
-
-
 static bool IsValidPlayTime(const char* pstrStartTime, const char* pstrEndTime)
 {
 	bool bRet = true;
 	if (NULL == pstrStartTime || NULL == pstrEndTime) {
 		return false;
 	}
+#ifndef DEVOPS_ON_ST
 
-#ifdef DEVOPS_ON_ST
-
-#else
-#ifdef RVC_OS_WIN
 	SYSTEMTIME st;
 	GetLocalTime(&st);
 	char strNow[MAX_PATH] = { 0 };
@@ -177,23 +152,11 @@ static bool IsValidPlayTime(const char* pstrStartTime, const char* pstrEndTime)
 	if (strcmp(strNow, pstrStartTime) < 0 || strcmp(strNow, pstrEndTime) >= 0) {
 		bRet = false;
 	}
-#else
-	struct tm* ptm = NULL;
-	time_t t = time(NULL);
-	ptm = localtime(&t);
-	char strNow[TIME_LEN] = { 0 };
-	snprintf(strNow, TIME_LEN, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-	if (strcmp(strNow, pstrStartTime) < 0 || strcmp(strNow, pstrEndTime) >= 0) {
-		bRet = false;
-	}
-#endif // RVC_OS_WIN
 
 #endif
-
 	return bRet;
 }
 
-
 static bool CheckFileExist(const char* pstrFolder, const char* pstrFileName, bool blog)
 {
 	bool bret = false;
@@ -1212,12 +1175,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
-				snprintf(strSwiftName, MAX_PATH, "%s", result[4]);
-#endif // RVC_OS_WIN
 			}
 			delete tmp;
 			tmp = NULL;

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -1957,13 +1957,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
-		sleep(2);
-#endif
-
 		ErrorCodeEnum Error = Error_Succeed;
 		Error = capture_create(&conf, m_capture, nCamera);
 		if (Error == Error_Succeed) 

Module/mod_recorder/mod_recorder.cpp

@@ -12,6 +12,7 @@
 #include "y2k_time.h"
 #include <string.h>
 #include "filecryption.h"
+#include "fileutil.h"
 
 #include "mod_facetracking/sysvar.h"
 #include "mod_interactivecontrol/Event.h"
@@ -44,34 +45,6 @@ using namespace Recorder;
 #define RVC_MIN_RECORD_FILESIZE 1024
 #endif
 
-//TODO: CrossPlaform  1111 [Gifur@2025730]
-static unsigned long GetFileSize(const char* pfilename)
-{
-#ifdef RVC_OS_WIN
-	unsigned long usize = 0;
-	if (NULL == pfilename) {
-		return usize;
-	}
-
-	FILE* pFile = fopen(pfilename, "rb");
-	if (pFile) {
-		fseek(pFile, 0, SEEK_END);
-		usize = ftell(pFile);
-		fclose(pFile);
-	}
-
-	return usize;
-#else
-	struct stat statbuf;
-	if (0 == stat(pfilename, &statbuf)) {
-		return statbuf.st_size;
-	}
-	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("errno info is %s.", strerror(errno));
-		return 0;
-	}	
-#endif
-}
 
 static const char* GetFileName(const char* pfilename)
 {
@@ -84,7 +57,7 @@ static const char* GetFileName(const char* pfilename)
 
 static void LogRecordFileInfo(const char* pszMessage)
 {
-	unsigned long ufilesize = GetFileSize(pszMessage);
+	unsigned long ufilesize = ReadFileSize(pszMessage);
 
 	char strhash[MAX_PATH] = { 0 };
 	get_file_sm3digest(strhash, MAX_PATH, pszMessage);
@@ -127,22 +100,6 @@ static bool rvcMoveFile(const char* strSrcFile, const char* strDstFile)
 	return bRet;
 }
 
-//TODO: CrossPlaform  [Gifur@2025728]
-static bool RvcDeleteFile(const char* strSrcFile)
-{
-	bool bRet = false;
-	if (NULL == strSrcFile) {
-		return bRet;
-	}
-
-	if (0 == remove(strSrcFile)) {
-		bRet = true;
-	}
-	
-	return bRet;
-}
-
-
 void RecordServiceSession::Handle_StartTransactionRecord(SpReqAnsContext<RecorderSerVice_StartTransactionRecord_Req, RecorderSerVice_StartTransactionRecord_Ans>::Pointer ctx)
 {
 	DbgToBeidou(ctx->link, __FUNCTION__)();
@@ -794,12 +751,8 @@ 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
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("%s(%d) while move %s ", strerror(errno), errno, srcfile.GetData()).GetData());
-#endif // 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 {
 			AddToVideoRecordList(dstfile.GetData());
@@ -811,12 +764,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
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("%s(%d) while move %s ", strerror(errno), errno, srcfile.GetData()).GetData());
-#endif // RVC_OS_WIN
 		}
 		else {
 			AddToVideoRecordList(dstfile.GetData());
@@ -849,22 +797,16 @@ int CRecorderEntity::HandleEncryptVideoRecord(const char* videofilename)
 	if (0 != iresult){
 		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_ENCRYPT_FAILED, CSimpleStringA::Format("encryption file %s failed, delete out temp file %s!", videofilename, strOutFile).GetData());
 		if (ExistsFile(strOutFile)) {
-			if (!RvcDeleteFile(strOutFile)) {
+			if (!RemoveFileA(strOutFile)) {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("DeleteFile file %s failed!", strOutFile);
 			}
 		}
 		return iRet;
 	}
-	//TODO: CrossPlaform  [Gifur@2025730]
-	bool bRet = RvcDeleteFile(videofilename);
+	bool bRet = RemoveFileA(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
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_DELETE_FAILED, CSimpleStringA::Format("%s(%d) while delete %s, delete out temp file[%s]!", strerror(errno), errno, videofilename, strOutFile).GetData());
-#endif // RVC_OS_WIN
-		if (!RvcDeleteFile(strOutFile)){
+		if (!RemoveFileA(strOutFile)){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("DeleteFile file %s failed!", strOutFile);
 		}
 		return iRet;
@@ -874,12 +816,8 @@ 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
-			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_RENAME_FAILED, CSimpleStringA::Format("%s(%d) while rename %s.", strerror(errno), errno, strOutFile).GetData());
-#endif // RVC_OS_WIN	
+			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_RECORDER_RENAME_FAILED
+				, CSimpleStringA::Format("Error Code %lu while rename %s.", GetLastError(), strOutFile).GetData());
 		}
 	}
 
@@ -921,12 +859,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
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_MOVE_FAILED, CSimpleStringA::Format("%s(%d) while move %s ", strerror(errno), errno, srcfile.GetData()));
-#endif // RVC_OS_WIN
 		}
 		else {
 			AddToVideoRecordList(dstfile.GetData());