为探测器模块增加log4cpp模块

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPD.AcqUnit.cpp

@@ -2,6 +2,7 @@
 //
 
 #include "CCOS.Dev.FPDDeviceMould.hpp"
+#include "Log4CPP.h"
 
 using namespace CCOS::Dev;
 using namespace CCOS::Dev::Detail::Detector;
@@ -52,7 +53,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetAcqMode(std::string in, std::string& out)
 {
 	ResDataObject json;
 	json.decode(in.c_str());
-	//mLog::FINFO("JSSetAcqMode. {$}", in.c_str());
+	FINFO("JSSetAcqMode. {$}", in.c_str());
 
 	if (json.GetFirstOf("P0") < 0)
 	{
@@ -68,7 +69,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetResolution(std::string in, std::string& out)
 {
 	ResDataObject json;
 	json.decode(in.c_str());
-	//mLog::FINFO("JSSetResolution. {$}", in.c_str());
+	FINFO("JSSetResolution. {$}", in.c_str());
 
 	if (json.GetFirstOf("P0") < 0)
 	{
@@ -87,7 +88,7 @@ RET_STATUS nsFPD::AcqUnit::SetResolution(int nResolution)
 
 RET_STATUS nsFPD::AcqUnit::JSSetGainMode(std::string in, std::string & out)
 {
-	//mLog::FINFO ("JSSetGainMode. {$}", in.c_str ());
+	FINFO ("JSSetGainMode. {$}", in.c_str ());
 	ResDataObject json;
 	json.decode(in.c_str());
 	string strP0 = (const char*)json["P0"];
@@ -100,7 +101,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetGainMode(std::string in, std::string & out)
 
 RET_STATUS nsFPD::AcqUnit::JSSetBinningMode(std::string in, std::string& out)
 {
-	//mLog::FINFO ("JSSetBinningMode. {$}", in.c_str ());
+	FINFO ("JSSetBinningMode. {$}", in.c_str ());
 	ResDataObject json;
 	json.decode(in.c_str());
 	string strP0 = (const char*)json["P0"];
@@ -114,7 +115,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetBinningMode(std::string in, std::string& out)
 
 RET_STATUS nsFPD::AcqUnit::JSSetZoomMode(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetZoomMode. {$}", in.c_str());
+	FINFO("JSSetZoomMode. {$}", in.c_str());
 	ResDataObject json;
 	json.decode(in.c_str());
 	string strP0 = (const char*)json["P0"];
@@ -148,7 +149,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetDemoImage(std::string in, std::string& out)
 		strP2 = (const char*)json["P2"];
 	}
 	
-	//mLog::FINFO("SetDemoImage in:{$}", in);
+	FINFO("SetDemoImage in:{$}", in);
 	out = "test@SetDemoImage";
 	SetDemoImage(strP0, strP1, strP2);
 	return RET_STATUS::RET_SUCCEED;
@@ -185,7 +186,7 @@ RET_STATUS nsFPD::AcqUnit::JSGetZskkFPDState(std::string & out)
 
 RET_STATUS nsFPD::AcqUnit::SetZskkFPDState(string in)
 {
-	//mLog::FINFO("SetZskkFPDState in:{$}", in);
+	FINFO("SetZskkFPDState in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -204,7 +205,7 @@ RET_STATUS nsFPD::AcqUnit::JSGetNoNeedWaitImage(std::string & out)
 
 RET_STATUS nsFPD::AcqUnit::JSSetNoNeedWaitImage(std::string in)
 {
-	//mLog::FINFO("JSSetNoNeedWaitImage in:{$}", in);
+	FINFO("JSSetNoNeedWaitImage in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -215,7 +216,7 @@ RET_STATUS nsFPD::AcqUnit::JSSetNoNeedWaitImage(std::string in)
 
 void nsFPD::AcqUnit::SendNoNeedWaitImage(bool bflag)
 {
-	//mLog::FINFO("SendNoNeedWaitImage bflag:{$}", bflag);
+	FINFO("SendNoNeedWaitImage bflag:{$}", bflag);
 	auto szFDinfo = std::to_string(bflag);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::NoNeedWaitImage, szFDinfo);
 }
@@ -255,7 +256,7 @@ RET_STATUS nsFPD::AcqUnit::AddFrameWithRawHead(IMAGE_VIEW_TYPE eType, string Ima
 	m_strLastImage = json.encode();
 
 	m_EventCenter->OnDataNotify((int)eType, AttrKey::ImgDataInfo, m_strLastImage, ImageHead, (char *)pFrameBuff, FrameSize * 2);
-	//mLog::FINFO("AddFrameWithRawHead FrameHeader:{$}", m_strLastImage.c_str());
+	FINFO("AddFrameWithRawHead FrameHeader:{$}", m_strLastImage.c_str());
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -438,13 +439,13 @@ void nsFPD::AcqUnit::SendAutonumousMapFinish(int nFlag)
 	szFPDinfo = to_string(nFlag);
 	m_strAutonumousMapFinish = szFPDinfo;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::AutonumousMapFinish, szFPDinfo);
-	//mLog::FINFO("SendAutonumousMapFinish({$})", szFPDinfo);
+	FINFO("SendAutonumousMapFinish({$})", szFPDinfo);
 	return;
 }
 
 RET_STATUS nsFPD::AcqUnit::JSSetFluPPS(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetFluPPS. {$}", in.c_str());
+	FINFO("JSSetFluPPS. {$}", in.c_str());
 
 	ResDataObject json;
 	json.decode(in.c_str());
@@ -479,7 +480,7 @@ RET_STATUS nsFPD::AcqUnit::GetFluPPS(float& fFluPPS)
 
 void nsFPD::AcqUnit::FluPPSNotify(float nCurrentFps)
 {
-	//mLog::FINFO("FluPPSNotify current fps: {$}", nCurrentFps);
+	FINFO("FluPPSNotify current fps: {$}", nCurrentFps);
 	string strFps = std::to_string(nCurrentFps);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::FluPPS, strFps);
 }
@@ -492,47 +493,47 @@ void nsFPD::AcqUnit::SetMaxFrameRate(float fMaxFrameRate)
 
 void nsFPD::AcqUnit::AcqModeNotify(string strAcqMode)
 {
-	//mLog::FINFO("AcqModeNotify strAcqMode: {$}", strAcqMode);
+	FINFO("AcqModeNotify strAcqMode: {$}", strAcqMode);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::AcqMode, strAcqMode);
 }
 
 void nsFPD::AcqUnit::ImagerPixelSpacingNotify(int nPixelSpacing)
 {
-	//mLog::FINFO("ImagerPixelSpacingNotify nPixelSpacing: {$}", nPixelSpacing);
+	FINFO("ImagerPixelSpacingNotify nPixelSpacing: {$}", nPixelSpacing);
 	//这里要把DICOM字段的值通知到ImageSave
 	float fTemp = nPixelSpacing / 1000.0f;
 	char temp[20] = { 0 };
 	snprintf(temp, sizeof(temp), "%.3f\\%.3f", fTemp, fTemp);
 	string strImagePixelSpacing = temp;
-	//mLog::FINFO("strImagePixelSpacing:{$}", strImagePixelSpacing);
+	FINFO("strImagePixelSpacing:{$}", strImagePixelSpacing);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::ImagerPixelSpacing, strImagePixelSpacing);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::DetectorElementSpacing, strImagePixelSpacing);
 }
 
 void nsFPD::AcqUnit::SidNotify(float fSid)
 {
-	//mLog::FINFO("SidNotify fSid: {$}", fSid);
+	FINFO("SidNotify fSid: {$}", fSid);
 	string strSid = to_string(fSid);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::DistanceSourcetoDetector, strSid);
 }
 
 void nsFPD::AcqUnit::SodNotify(float fSod)
 {
-	//mLog::FINFO("SodNotify fSod: {$}", fSod);
+	FINFO("SodNotify fSod: {$}", fSod);
 	string strSod = to_string(fSod);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::DistanceSourcetoPatient, strSod);
 }
 
 void nsFPD::AcqUnit::ErmfNotify(float fErmf)
 {
-	//mLog::FINFO("ErmfNotify fErmf: {$}", fErmf);
+	FINFO("ErmfNotify fErmf: {$}", fErmf);
 	string strErmf = to_string(fErmf);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::EstimatedRadiographicMagnificationFactor, strErmf);
 }
 
 RET_STATUS nsFPD::AcqUnit::JSUpdateModeInRunning(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateModeInRunning in:{$}", in);
+	FINFO("JSUpdateModeInRunning in:{$}", in);
 	ResDataObject json;
 	json.decode(in.c_str());
 	std::vector<AcqModeInfo> vAcqModeList;

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPD.CalibUnit.cpp

@@ -2,6 +2,7 @@
 //
 
 #include "CCOS.Dev.FPDDeviceMould.hpp"
+#include "Log4CPP.h"
 
 using namespace CCOS::Dev;
 using namespace CCOS::Dev::Detail::Detector;
@@ -42,7 +43,7 @@ void OEM_IF nsFPD::CalibUnit::SetEventCenter(std::shared_ptr <CCOS::Dev::IOEvent
 
 RET_STATUS nsFPD::CalibUnit::JSSetSID(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetSID. {$}", in.c_str());
+	FINFO("JSSetSID. {$}", in.c_str());
 	ResDataObject json;
 	json.decode(in.c_str());
 	int mode = json[0];
@@ -57,8 +58,8 @@ RET_STATUS nsFPD::CalibUnit::JSActiveCalibration(std::string in, std::string & o
 	int mode = json[0];
 	cout << "CalibUnit::JSActiveCalibration mode:" << mode << endl;
 
-	//mLog::FINFO("JSActiveCalibration. {$}", in.c_str());
-	//mLog::FINFO("Calibrationtype is {$}", mode);
+	FINFO("JSActiveCalibration. {$}", in.c_str());
+	FINFO("Calibrationtype is {$}", mode);
 	out = "test@ActiveCalibration";
 	CCOS_CALIBRATION_TYPE type = CCOS_CALIBRATION_TYPE_NONE;
 	if (mode == CCOS_CALIBRATION_TYPE_DARK)
@@ -79,7 +80,7 @@ RET_STATUS nsFPD::CalibUnit::JSActiveCalibration(std::string in, std::string & o
 
 RET_STATUS nsFPD::CalibUnit::JSGetRequestedDose(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSGetRequestedDose");
+	FINFO("JSGetRequestedDose");
 	string strDoseInfo = "";
 	RET_STATUS bret = GetRequestedDose(strDoseInfo);
 	if (RET_STATUS::RET_SUCCEED == bret)
@@ -91,7 +92,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetRequestedDose(std::string in, std::string& out
 
 RET_STATUS nsFPD::CalibUnit::JSSetRequestedDose(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetRequestedDose. \n{$}", in.c_str());
+	FINFO("JSSetRequestedDose. \n{$}", in.c_str());
 	RET_STATUS nRet = SetRequestedDose(in);
 	return nRet;
 }
@@ -103,25 +104,25 @@ RET_STATUS nsFPD::CalibUnit::SetRequestedDose(std::string in)
 
 RET_STATUS nsFPD::CalibUnit::JSPrepareCalibration(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSPrepareCalibration.");
+	FINFO("JSPrepareCalibration.");
 	return PrepareCalibration();
 }
 
 RET_STATUS nsFPD::CalibUnit::JSStartCalibration(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSStartCalibration.");
+	FINFO("JSStartCalibration.");
 	return StartCalibration();
 }
 
 RET_STATUS OEM_IF nsFPD::CalibUnit::PauseCalibration()
 {
-	//mLog::FINFO("PauseCalibration.");
+	FINFO("PauseCalibration.");
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::CalibUnit::JSStopCalibration(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSStopCalibration.");
+	FINFO("JSStopCalibration.");
 	return StopCalibration();
 }
 
@@ -149,7 +150,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetCalibStatus(std::string & out)
 
 RET_STATUS nsFPD::CalibUnit::SetCalibrationStatus(string in)
 {
-	//mLog::FINFO("SetCalibrationStatus in:{$}", in);
+	FINFO("SetCalibrationStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -181,7 +182,7 @@ RET_STATUS nsFPD::CalibUnit::SetCalibrationStatus(string in)
 	}
 	m_CalibStatus = (CCOS_CALIBRATION_STATUS)nCalibrationStatus;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::CalibrationStatus, in);
-	//mLog::FINFO("CalibrationStatus: {$}",strTemp.c_str());
+	FINFO("CalibrationStatus: {$}",strTemp.c_str());
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -198,7 +199,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetCalibProgress(std::string & out)
 
 RET_STATUS nsFPD::CalibUnit::SetCalibrationProgress(string in)
 {
-	//mLog::FINFO("SetCalibrationProgress in:{$}", in);
+	FINFO("SetCalibrationProgress in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -206,7 +207,7 @@ RET_STATUS nsFPD::CalibUnit::SetCalibrationProgress(string in)
 
 	m_strCalibProgress = in;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::CalibrationProgress, m_strCalibProgress);
-	//mLog::FINFO("CalibrationProgress: {$}", m_strCalibProgress);
+	FINFO("CalibrationProgress: {$}", m_strCalibProgress);
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -240,14 +241,14 @@ RET_STATUS nsFPD::CalibUnit::JSGetUploadCalibrationFilesResult(std::string & out
 
 RET_STATUS nsFPD::CalibUnit::SetUploadCalibrationFilesResult(string in)
 {
-	//mLog::FINFO("SetUploadCalibrationFilesResult in:{$}", in);
+	FINFO("SetUploadCalibrationFilesResult in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
 	}
 	m_strUploadCalibrationFilesResult = in;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::UploadCalibrationFilesResult, m_strUploadCalibrationFilesResult);
-	//mLog::FINFO("UploadCalibrationFilesResult:{$}", m_strUploadCalibrationFilesResult);
+	FINFO("UploadCalibrationFilesResult:{$}", m_strUploadCalibrationFilesResult);
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -294,7 +295,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetHaveImgCalibration(std::string& out)
 	{
 		out =  "0";
 	}
-	//mLog::FINFO("JSGetHaveImgCalibration out:{$}",out.c_str());
+	FINFO("JSGetHaveImgCalibration out:{$}",out.c_str());
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -305,7 +306,7 @@ bool nsFPD::CalibUnit::Support_HaveImageCalib()
 
 RET_STATUS nsFPD::CalibUnit::JSGetCalibrationStep(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSGetCalibrationStep. \n{$}", in.c_str());
+	FINFO("JSGetCalibrationStep. \n{$}", in.c_str());
 	int nDetectorID = 0;
 	string strCalibrationStepInfo;
 	
@@ -343,7 +344,7 @@ RET_STATUS nsFPD::CalibUnit::RejectCalibration()
 
 RET_STATUS nsFPD::CalibUnit::JSSaveCalibrationFile(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSaveCalibrationFile.\n{$}", in.c_str());
+	FINFO("JSSaveCalibrationFile.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	bool bSaveFlag = false;
@@ -353,7 +354,7 @@ RET_STATUS nsFPD::CalibUnit::JSSaveCalibrationFile(std::string in, std::string&
 	}
 	catch (...)
 	{
-		//mLog::FERROR("JSSaveCalibrationFile parameter error");
+		FERROR("JSSaveCalibrationFile parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = SaveCalibrationFile(bSaveFlag);
@@ -376,12 +377,12 @@ void OEM_IF nsFPD::CalibUnit::SetSaveCalibrationFileFinish(bool bResult)
 	string strFPDInfo = std::to_string(bResult);
 	m_strSaveCalibrationFileFinish = strFPDInfo;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::SaveCalibrationFileFinish, m_strSaveCalibrationFileFinish);
-	//mLog::FINFO("SetSaveCalibrationFileFinish. {$}", strFPDInfo);
+	FINFO("SetSaveCalibrationFileFinish. {$}", strFPDInfo);
 }
 
 RET_STATUS nsFPD::CalibUnit::JSStartOffset(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSStartOffset: {$}", in.c_str());
+	FINFO("JSStartOffset: {$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	bool isAll = false;
@@ -391,7 +392,7 @@ RET_STATUS nsFPD::CalibUnit::JSStartOffset(std::string in, std::string& out)
 	}
 	catch (...)
 	{
-		//mLog::FERROR("JSStartOffset parameter error");
+		FERROR("JSStartOffset parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	return StartOffset(isAll);
@@ -404,7 +405,7 @@ RET_STATUS nsFPD::CalibUnit::StartOffset(bool isAll)
 
 RET_STATUS nsFPD::CalibUnit::JSAbortOffset(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSAbortOffset");
+	FINFO("JSAbortOffset");
 	return AbortOffset();
 }
 
@@ -421,7 +422,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetOffsetStatus(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetOffsetStatus(std::string in)
 {
-	//mLog::FINFO("SetOffsetStatus in:{$}", in);
+	FINFO("SetOffsetStatus in:{$}", in);
 	m_strOffsetStatus = in;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, "OffsetStatus", m_strOffsetStatus);
 	return RET_STATUS::RET_SUCCEED;
@@ -435,7 +436,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetOffsetCounts(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetOffsetCounts(std::string in)
 {
-	//mLog::FINFO("SetOffsetCounts in:{$}", in);
+	FINFO("SetOffsetCounts in:{$}", in);
 	m_strOffsetCounts = in;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, "OffsetCounts", m_strOffsetCounts);
 	return RET_STATUS::RET_SUCCEED;
@@ -449,7 +450,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetOffsetProgress(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetOffsetProgress(std::string in)
 {
-	//mLog::FINFO("SetOffsetProgress in:{$}", in);
+	FINFO("SetOffsetProgress in:{$}", in);
 	m_strOffsetProgress = in;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, "OffsetProgress", m_strOffsetProgress);
 	return RET_STATUS::RET_SUCCEED;
@@ -463,14 +464,14 @@ RET_STATUS nsFPD::CalibUnit::JSGetOffsetInterval(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetOffsetInterval(std::string in)
 {
-	//mLog::FINFO("SetOffsetInterval in:{$}", in);
+	FINFO("SetOffsetInterval in:{$}", in);
 	m_strOffsetInterval = in;
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::CalibUnit::JSUpdateOffsetInterval(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateOffsetInterval in:{$}", in);
+	FINFO("JSUpdateOffsetInterval in:{$}", in);
 	m_strOffsetInterval = in;
 	out = m_strOffsetInterval;
 	return RET_STATUS::RET_SUCCEED;
@@ -485,7 +486,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetCalibMode(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetCalibMode(string in)
 {
-	//mLog::FINFO("SetCalibMode in:{$}", in);
+	FINFO("SetCalibMode in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -497,7 +498,7 @@ RET_STATUS nsFPD::CalibUnit::SetCalibMode(string in)
 
 RET_STATUS nsFPD::CalibUnit::JSUpdateCalibMode(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateCalibMode in:{$}", in);
+	FINFO("JSUpdateCalibMode in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -521,7 +522,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetLastCalibrationDate(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetLastCalibrationDate(string in)
 {
-	//mLog::FINFO("SetLastCalibrationDate in:{$}", in);
+	FINFO("SetLastCalibrationDate in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -533,7 +534,7 @@ RET_STATUS nsFPD::CalibUnit::SetLastCalibrationDate(string in)
 
 RET_STATUS nsFPD::CalibUnit::JSUpdateLastCalibrationDate(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateLastCalibrationDate in:{$}", in);
+	FINFO("JSUpdateLastCalibrationDate in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -555,7 +556,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetCalibrationFileExpireTime(std::string& out)
 
 RET_STATUS nsFPD::CalibUnit::SetCalibrationFileExpireTime(string in)
 {
-	//mLog::FINFO("SetCalibrationFileExpireTime in:{$}", in);
+	FINFO("SetCalibrationFileExpireTime in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -567,7 +568,7 @@ RET_STATUS nsFPD::CalibUnit::SetCalibrationFileExpireTime(string in)
 
 RET_STATUS nsFPD::CalibUnit::JSUpdateCalibrationFileExpireTime(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateCalibrationFileExpireTime in:{$}", in);
+	FINFO("JSUpdateCalibrationFileExpireTime in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -589,7 +590,7 @@ RET_STATUS nsFPD::CalibUnit::JSGetCalibrationFileExpirationReminder(std::string&
 
 RET_STATUS nsFPD::CalibUnit::SetCalibrationFileExpirationReminder(string in)
 {
-	//mLog::FINFO("SetCalibrationFileExpirationReminder in:{$}", in);
+	FINFO("SetCalibrationFileExpirationReminder in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -601,7 +602,7 @@ RET_STATUS nsFPD::CalibUnit::SetCalibrationFileExpirationReminder(string in)
 
 RET_STATUS nsFPD::CalibUnit::JSUpdateCalibrationFileExpirationReminder(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateCalibrationFileExpirationReminder in:{$}", in);
+	FINFO("JSUpdateCalibrationFileExpirationReminder in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPD.CtrlUnit.cpp

@@ -2,6 +2,7 @@
 //
 
 #include "CCOS.Dev.FPDDeviceMould.hpp"
+#include "Log4CPP.h"
 
 using namespace CCOS::Dev;
 using namespace CCOS::Dev::Detail::Detector;
@@ -84,7 +85,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSActiveDetector(std::string in, std::string
 		return RET_STATUS::RET_FAILED;
 	}
 
-	//mLog::FINFO("JSActiveDetector. {$}", in.c_str());
+	FINFO("JSActiveDetector. {$}", in.c_str());
 	ActiveDetector(bActive);
 	out = "test@ActiveDetector";
 	return RET_STATUS::RET_SUCCEED;
@@ -92,14 +93,14 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSActiveDetector(std::string in, std::string
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSWakeupDetector(std::string in, std::string & out)
 {
-	//mLog::FINFO("JSWakeupDetector. {$}", in.c_str());
+	FINFO("JSWakeupDetector. {$}", in.c_str());
 	out = "test@WakeupDetector";
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSRESET(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSRESET");
+	FINFO("JSRESET");
 	RESET();
 	return RET_STATUS::RET_SUCCEED;
 }
@@ -131,34 +132,34 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSEnterExam(std::string in, std::string & ou
 	{
 		return RET_STATUS::RET_FAILED;
 	}
-	//mLog::FINFO("JSEnterExam.{$}", in.c_str());
+	FINFO("JSEnterExam.{$}", in.c_str());
 	EnterExam(mode);
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSExitExam(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSExitExam.");
+	FINFO("JSExitExam.");
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSAttachConnect(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSAttachConnect.");
+	FINFO("JSAttachConnect.");
 	AttachConnect();
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSCancelAttach(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSCancelAttach.");
+	FINFO("JSCancelAttach.");
 	CancelAttach();
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetConnectStatus(std::string & out)
 {
-	//mLog::FINFO("JSGetConnectStatus.");
+	FINFO("JSGetConnectStatus.");
 	out = to_string(m_DetectorConnectStatus);
 	return RET_STATUS::RET_SUCCEED;
 }
@@ -166,34 +167,34 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetConnectStatus(std::string & out)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSResetConnect(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSResetConnect.");
+	FINFO("JSResetConnect.");
 	ResetConnect();
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSDisConnectFPD(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSDisConnectFPD.");
+	FINFO("JSDisConnectFPD.");
 	DisConnectFPD();
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSDisConnectFPDForce(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSDisConnectFPDForce.");
+	FINFO("JSDisConnectFPDForce.");
 	DisConnectFPDForce();
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateFirmware(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateFirmware.");
+	FINFO("JSUpdateFirmware.");
 	return UpdateFirmware();
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorInfo(std::string in, std::string & out)
 {
-	//mLog::FINFO("JSGetDetectorInfo.");
+	FINFO("JSGetDetectorInfo.");
 	string strFPDinfo;
 	GetDetectorInfo(strFPDinfo);
 
@@ -203,7 +204,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorInfo(std::string in, std::strin
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetRecoverImageState(std::string in, std::string & out)
 {
-	//mLog::FINFO("JSGetRecoverImageState.");
+	FINFO("JSGetRecoverImageState.");
 	string strFPDinfo;
 	GetRecoverImageState(strFPDinfo);
 
@@ -222,17 +223,17 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSRecoverImage(std::string in, std::string &
 	}
 	catch (...)
 	{
-		//mLog::FERROR("JSRecoverImage decode failed {$}", in.c_str());
+		FERROR("JSRecoverImage decode failed {$}", in.c_str());
 		return RET_STATUS::RET_FAILED;
 	}
-	//mLog::FINFO("JSRecoverImage. {$}",in.c_str());
+	FINFO("JSRecoverImage. {$}",in.c_str());
 	RecoverImage(mode);
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSSaveSensitivity(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSaveSensitivity.");
+	FINFO("JSSaveSensitivity.");
 	SaveSensitivity();
 	return RET_STATUS::RET_SUCCEED;
 }
@@ -241,7 +242,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSSaveSensitivity(std::string in, std::strin
 //动态探测器先采图，后出线。出线时调用这个接口告知探测器可以取曝光图像
 RET_STATUS DetectorCtrlUnit::JSSetXrayOnNum(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetXrayOnNum.{$}",in.c_str());
+	FINFO("JSSetXrayOnNum.{$}",in.c_str());
 	SetXrayOnNum();
 	return RET_STATUS::RET_SUCCEED;
 }
@@ -250,7 +251,7 @@ RET_STATUS DetectorCtrlUnit::JSSetXrayOnNum(std::string in, std::string& out)
 //告知探测器序列采集图像张数，停止采集时等图使用
 RET_STATUS DetectorCtrlUnit::JSSetExposureTimes(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSetExposureTimes.{$}", in.c_str());
+	FINFO("JSSetExposureTimes.{$}", in.c_str());
 	ResDataObject json;
 	json.decode(in.c_str());
 	int nTimes = 0;
@@ -267,7 +268,7 @@ RET_STATUS DetectorCtrlUnit::JSSetExposureTimes(std::string in, std::string& out
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetConnectStatus(string in)
 {
-	//mLog::FINFO("SetConnectStatus in:{$}", in);
+	FINFO("SetConnectStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -308,14 +309,14 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetConnectStatus(string in)
 		break;
 	}
 	m_DetectorConnectStatus = (DETECTOR_SHARE_STATUS)nConnectStatus;
-	//mLog::FINFO("DetectorConnectStatus: {$}", strStatus);
+	FINFO("DetectorConnectStatus: {$}", strStatus);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::DetectorConnectStatus, in);
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFPDStatus(std::string & out)
 {
-	//mLog::FINFO("JSGetFPDStatus");
+	FINFO("JSGetFPDStatus");
 	auto szFDinfo = std::to_string(m_DetectorStatus);
 	out = szFDinfo;
 	return RET_STATUS::RET_SUCCEED;
@@ -323,7 +324,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFPDStatus(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorStatus(string in)
 {
-	//mLog::FINFO("SetDetectorStatus in:{$}", in);
+	FINFO("SetDetectorStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -362,7 +363,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorStatus(string in)
 	}
 	m_DetectorStatus = (DETECTOR_STATUS)nDetectorStatus;
 
-	//mLog::FINFO("DetectorStatus: {$}", strStatus);
+	FINFO("DetectorStatus: {$}", strStatus);
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::DetectorStatus, in);
 	return RET_STATUS::RET_SUCCEED;
 }
@@ -374,7 +375,7 @@ DETECTOR_STATUS OEM_IF nsFPD::DetectorCtrlUnit::GetDetectorStatus()
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetAttachResult(std::string & out)
 {
-	//mLog::FINFO("JSGetAttachResult");
+	FINFO("JSGetAttachResult");
 	ResDataObject json;
 	json.add(DetectorDescription, "test");
 	json.add(DetectorSerialNumber, "987");
@@ -405,14 +406,14 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetAttachResult(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetAttachStatus(std::string & out)
 {
-	//mLog::FINFO("JSGetAttachStatus");
+	FINFO("JSGetAttachStatus");
 	out = m_strAttachStatus;
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetAttachStatus(string in)
 {
-	//mLog::FINFO("SetAttachStatus in:{$}", in);
+	FINFO("SetAttachStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -424,14 +425,14 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetAttachStatus(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetInitialStatus(std::string & out)
 {
-	//mLog::FINFO("JSGetInitialStatus");
+	FINFO("JSGetInitialStatus");
 	out = m_strInitialStatus;
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetInitialStatus(string in)
 {
-	//mLog::FINFO("SetInitialStatus in:{$}", in);
+	FINFO("SetInitialStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -443,14 +444,14 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetInitialStatus(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetUpdateFWStatus(std::string & out)
 {
-	//mLog::FINFO("JSGetUpdateFWStatus");
+	FINFO("JSGetUpdateFWStatus");
 	out = m_strUpdateFWStatus;
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetUpdateFWStatus(string in)
 {
-	//mLog::FINFO("SetUpdateFWStatus in:{$}", in);
+	FINFO("SetUpdateFWStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -462,7 +463,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetUpdateFWStatus(string in)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShockSensorInfo(string in)
 {
-	//mLog::FINFO("SetShockSensorInfo in:{$}", in);
+	FINFO("SetShockSensorInfo in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -481,7 +482,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetShockSensorInfo(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetRecoverImageState(string in)
 {
-	//mLog::FINFO("SetRecoverImageState in:{$}", in);
+	FINFO("SetRecoverImageState in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -500,7 +501,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetRecoverImageState(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetRecoverImageEvent(string in)
 {
-	//mLog::FINFO("SetRecoverImageEvent in:{$}", in);
+	FINFO("SetRecoverImageEvent in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -520,7 +521,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetRecoverImageEvent(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFieldofViewShape(string in)
 {
-	//mLog::FINFO("SetFieldofViewShape in:{$}", in);
+	FINFO("SetFieldofViewShape in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -539,7 +540,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFieldofViewShape(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFieldofViewDimension(string in)
 {
-	//mLog::FINFO("SetFieldofViewDimension in:{$}", in);
+	FINFO("SetFieldofViewDimension in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -558,7 +559,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFieldofViewDimension(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorType(string in)
 {
-	//mLog::FINFO("SetDetectorType in:{$}", in);
+	FINFO("SetDetectorType in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -577,7 +578,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorType(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDescription(string in)
 {
-	//mLog::FINFO("SetDescription in:{$}", in);
+	FINFO("SetDescription in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -596,7 +597,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDescription(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorID(string in)
 {
-	//mLog::FINFO("SetDetectorID in:{$}", in);
+	FINFO("SetDetectorID in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -615,7 +616,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorID(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDateofLastDetectorCalibration(string in)
 {
-	//mLog::FINFO("SetDateofLastDetectorCalibration in:{$}", in);
+	FINFO("SetDateofLastDetectorCalibration in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -634,7 +635,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDateofLastDetectorCalibration(std::stri
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetTimeofLastDetectorCalibration(string in)
 {
-	//mLog::FINFO("SetTimeofLastDetectorCalibration in:{$}", in);
+	FINFO("SetTimeofLastDetectorCalibration in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -653,7 +654,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetTimeofLastDetectorCalibration(std::stri
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorConditionsNominalFlag(string in)
 {
-	//mLog::FINFO("SetDetectorConditionsNominalFlag in:{$}", in);
+	FINFO("SetDetectorConditionsNominalFlag in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -672,7 +673,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorConditionsNominalFlag(std::stri
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFPDSensitivity(string in)
 {
-	//mLog::FINFO("SetFPDSensitivity in:{$}", in);
+	FINFO("SetFPDSensitivity in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -685,7 +686,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFPDSensitivity(string in)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFPDSensitivityResult(string in)
 {
-	//mLog::FINFO("SetFPDSensitivityResult in:{$}", in);
+	FINFO("SetFPDSensitivityResult in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -710,7 +711,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFPDSensitivity(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetPixelData(string in)
 {
-	//mLog::FINFO("SetPixelData in:{$}", in);
+	FINFO("SetPixelData in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -729,7 +730,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetPixelData(std::string & out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetTargetEXI(string in)
 {
-	//mLog::FINFO("SetTargetEXI in:{$}", in);
+	FINFO("SetTargetEXI in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -761,7 +762,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetSupportDDR(std::string& out)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::SetSupportDDR(string in)
 {
-	//mLog::FINFO("SetSupportDDR in:{$}", in);
+	FINFO("SetSupportDDR in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -773,7 +774,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::SetSupportDDR(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetSupportSwitchResolution(std::string& out)
 {
-	//mLog::FINFO("JSGetSupportSwitchResolution m_strSupportSwitchResolution:{$}", m_strSupportSwitchResolution);
+	FINFO("JSGetSupportSwitchResolution m_strSupportSwitchResolution:{$}", m_strSupportSwitchResolution);
 	if (m_strSupportSwitchResolution == "1")
 	{
 		out = "1";
@@ -787,7 +788,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetSupportSwitchResolution(std::string& ou
 
 RET_STATUS nsFPD::DetectorCtrlUnit::SetSupportSwitchResolution(string in)
 {
-	//mLog::FINFO("SetSupportSwitchResolution in:{$}", in);
+	FINFO("SetSupportSwitchResolution in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -805,7 +806,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetCurrentResolution(std::string& out)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::SetCurrentResolution(string in)
 {
-	//mLog::FINFO("SetCurrentResolution in:{$}", in);
+	FINFO("SetCurrentResolution in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -817,7 +818,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::SetCurrentResolution(string in)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetLastError(string in)
 {
-	//mLog::FINFO("SetLastError in:{$}", in);
+	FINFO("SetLastError in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -917,7 +918,7 @@ RET_STATUS DetectorCtrlUnit::JSSetFilterType(std::string in, std::string& out)
 	}
 	catch (ResDataObjectExption& e)
 	{
-		//mLog::FERROR("JSSetFilterType exception %s\n", e.what());
+		FERROR("JSSetFilterType exception %s\n", e.what());
 		return RET_STATUS::RET_FAILED;
 	}
 	SetFilterType(nValue);
@@ -931,7 +932,7 @@ RET_STATUS DetectorCtrlUnit::SetFilterType(int nFilter)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetFirmwareStatus(string in)
 {
-	//mLog::FINFO("SetFirmwareStatus in:{$}", in);
+	FINFO("SetFirmwareStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -949,7 +950,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetFirmwareStatus(std::string& out)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSSaveRawDataMode(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSSaveRawDataMode.\n{$}", in.c_str());
+	FINFO("JSSaveRawDataMode.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	int nSaveRawDataMode = 0;
@@ -959,7 +960,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSSaveRawDataMode(std::string in, std::strin
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get SaveRawDataMode parameter error");
+		FERROR("Get SaveRawDataMode parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = SaveRawDataMode(nSaveRawDataMode);
@@ -974,7 +975,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::SaveRawDataMode(int nSaveRawDataMode)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSOfflineFPD(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSOfflineFPD.\n{$}", in.c_str());
+	FINFO("JSOfflineFPD.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	int nOfflineFPDMode = 0;
@@ -984,7 +985,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSOfflineFPD(std::string in, std::string& ou
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get OfflineFPD parameter error");
+		FERROR("Get OfflineFPD parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = OfflineFPD(nOfflineFPDMode);
@@ -999,7 +1000,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::OfflineFPD(int nOfflineFPDMode)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSOnlineFPD(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSOnlineFPD.\n{$}", in.c_str());
+	FINFO("JSOnlineFPD.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	int nOnlineFPDMode = 0;
@@ -1009,7 +1010,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSOnlineFPD(std::string in, std::string& out
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get OnlineFPD parameter error");
+		FERROR("Get OnlineFPD parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = OnlineFPD(nOnlineFPDMode);
@@ -1024,7 +1025,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::OnlineFPD(int nOnlineFPDMode)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetAutonumousImageList(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSGetAutonumousImageList.\n{$}", in.c_str());
+	FINFO("JSGetAutonumousImageList.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	vector<string> vecAutonumousList;
 	ResDataObject jsonAutonumousList;
@@ -1037,12 +1038,12 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetAutonumousImageList(std::string in, std
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get GetAutonumousImageList parameter error");
+		FERROR("Get GetAutonumousImageList parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = GetAutonumousImageList(nDetectorID, vecAutonumousList);
 	size_t nPatientNum = vecAutonumousList.size();
-	//mLog::FINFO("Get patient number: {$}", nPatientNum);
+	FINFO("Get patient number: {$}", nPatientNum);
 	for (int i = 0; i < nPatientNum; ++i)
 	{
 		char tempKey[32];
@@ -1051,7 +1052,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetAutonumousImageList(std::string in, std
 	}
 
 	out = jsonAutonumousList.encode();
-	//mLog::FINFO("Out List.\n{$}", out.c_str());
+	FINFO("Out List.\n{$}", out.c_str());
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -1062,7 +1063,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::GetAutonumousImageList(int nDetectorID, vect
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSRemoveAutonumousImageList(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSRemoveAutonumousImageList.\n{$}", in.c_str());
+	FINFO("JSRemoveAutonumousImageList.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	string strMeta;
@@ -1072,7 +1073,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSRemoveAutonumousImageList(std::string in,
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get RemoveAutonumousImageList parameter error");
+		FERROR("Get RemoveAutonumousImageList parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = RemoveAutonumousImageList(strMeta);
@@ -1087,7 +1088,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::RemoveAutonumousImageList(string strMeta)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSRemoveAutonumousAll(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSRemoveAutonumousAll.\n{$}", in.c_str());
+	FINFO("JSRemoveAutonumousAll.\n{$}", in.c_str());
 	RET_STATUS nRet = RemoveAutonumousAll();
 	out = "test@RemoveAutonumousAll";
 	return nRet;
@@ -1100,7 +1101,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::RemoveAutonumousAll()
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSGetImageMetaData(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSGetImageMetaData.\n{$}", in.c_str());
+	FINFO("JSGetImageMetaData.\n{$}", in.c_str());
 	ResDataObject jsonInput;
 	jsonInput.decode(in.c_str());
 	string strMeta;
@@ -1110,7 +1111,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetImageMetaData(std::string in, std::stri
 	}
 	catch (...)
 	{
-		//mLog::FERROR("Get GetImageMetaData parameter error");
+		FERROR("Get GetImageMetaData parameter error");
 		return RET_STATUS::RET_FAILED;
 	}
 	RET_STATUS nRet = GetImageMetaData(strMeta);
@@ -1125,7 +1126,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::GetImageMetaData(string strMetaData)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSExportAutonumousAll(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSExportAutonumousAll.\n{$}", in.c_str());
+	FINFO("JSExportAutonumousAll.\n{$}", in.c_str());
 	RET_STATUS nRet = ExportAutonumousAll();
 	out = "test@ExportAutonumousAll";
 	return RET_STATUS::RET_SUCCEED;
@@ -1144,7 +1145,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorWidth(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorWidth(string in)
 {
-	//mLog::FINFO("SetDetectorWidth in:{$}", in);
+	FINFO("SetDetectorWidth in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1161,7 +1162,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorHeight(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorHeight(string in)
 {
-	//mLog::FINFO("SetDetectorHeight in:{$}", in);
+	FINFO("SetDetectorHeight in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1172,7 +1173,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorHeight(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateNotifyStatusTimePeriod(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateNotifyStatusTimePeriod in:{$}", in);
+	FINFO("JSUpdateNotifyStatusTimePeriod in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1188,7 +1189,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::UpdateNotifyStatusTimePeriod(int nTime)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateReconnectTimePeriod(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateReconnectTimePeriod in:{$}", in);
+	FINFO("JSUpdateReconnectTimePeriod in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1204,7 +1205,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::UpdateReconnectTimePeriod(int nTime)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateDetectorWiredIP(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateDetectorWiredIP in:{$}", in);
+	FINFO("JSUpdateDetectorWiredIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1227,7 +1228,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::UpdateDetectorWiredIP(string strWiredIP)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateDetectorWirelessIP(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateDetectorWirelessIP in:{$}", in);
+	FINFO("JSUpdateDetectorWirelessIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1250,7 +1251,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::UpdateDetectorWirelessIP(string strWirelessI
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateLocalIP(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateLocalIP in:{$}", in);
+	FINFO("JSUpdateLocalIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1279,7 +1280,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorWiredIP(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorWiredIP(string in)
 {
-	//mLog::FINFO("SetDetectorWiredIP in:{$}", in);
+	FINFO("SetDetectorWiredIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1296,7 +1297,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetDetectorWirelessIP(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetDetectorWirelessIP(string in)
 {
-	//mLog::FINFO("SetDetectorWirelessIP in:{$}", in);
+	FINFO("SetDetectorWirelessIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1313,7 +1314,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetLocalIP(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetLocalIP(string in)
 {
-	//mLog::FINFO("SetLocalIP in:{$}", in);
+	FINFO("SetLocalIP in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1330,7 +1331,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetSerialNumber(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetSerialNumber(string in)
 {
-	//mLog::FINFO("SetSerialNumber in:{$}", in);
+	FINFO("SetSerialNumber in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1341,7 +1342,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetSerialNumber(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateSerialNumber(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateSerialNumber in:{$}", in);
+	FINFO("JSUpdateSerialNumber in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1358,7 +1359,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetShowTemperature(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowTemperature(string in)
 {
-	//mLog::FINFO("SetShowTemperature in:{$}", in);
+	FINFO("SetShowTemperature in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1369,7 +1370,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowTemperature(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateShowTemperature(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateShowTemperature in:{$}", in);
+	FINFO("JSUpdateShowTemperature in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1386,7 +1387,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetShowWifi(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowWifi(string in)
 {
-	//mLog::FINFO("SetShowWifi in:{$}", in);
+	FINFO("SetShowWifi in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1397,7 +1398,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowWifi(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateShowWifi(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateShowWifi in:{$}", in);
+	FINFO("JSUpdateShowWifi in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1414,7 +1415,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetShowBattery(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowBattery(string in)
 {
-	//mLog::FINFO("SetShowBattery in:{$}", in);
+	FINFO("SetShowBattery in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1425,7 +1426,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowBattery(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateShowBattery(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateShowBattery in:{$}", in);
+	FINFO("JSUpdateShowBattery in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1442,7 +1443,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSGetShowBluetooth(std::string& out)
 
 RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowBluetooth(string in)
 {
-	//mLog::FINFO("SetShowBluetooth in:{$}", in);
+	FINFO("SetShowBluetooth in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1453,7 +1454,7 @@ RET_STATUS OEM_IF nsFPD::DetectorCtrlUnit::SetShowBluetooth(string in)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateShowBluetooth(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSUpdateShowBluetooth in:{$}", in);
+	FINFO("JSUpdateShowBluetooth in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1464,7 +1465,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::JSUpdateShowBluetooth(std::string in, std::s
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSFaultInjection(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSFaultInjection in:{$}", in);
+	FINFO("JSFaultInjection in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -1479,7 +1480,7 @@ RET_STATUS nsFPD::DetectorCtrlUnit::FaultInjection(string strErrorCode)
 
 RET_STATUS nsFPD::DetectorCtrlUnit::JSEliminateFault(std::string in, std::string& out)
 {
-	//mLog::FINFO("JSEliminateFault in:{$}", in);
+	FINFO("JSEliminateFault in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPD.SyncUnit.cpp

@@ -2,12 +2,13 @@
 //
 
 #include "CCOS.Dev.FPDDeviceMould.hpp"
+#include "Log4CPP.h"
 
 using namespace CCOS::Dev;
 using namespace CCOS::Dev::Detail::Detector;
 namespace nsFPD = CCOS::Dev::Detail::Detector;
 
-//extern Log4CPP::Logger* ////mLog::gLogger;
+//extern Log4CPP::Logger* //gLogger;
 
 //-----------------------------------------------------------------------------
 //		SyncUnit
@@ -36,7 +37,7 @@ void OEM_IF nsFPD::SyncUnit::SetEventCenter(std::shared_ptr <CCOS::Dev::IOEventC
 
 RET_STATUS nsFPD::SyncUnit::JSSetXwindowSize(std::string in, std::string & out)
 {
-	////mLog::FINFO("JSSetXwindowSize. {$}",in.c_str());
+	//FINFO("JSSetXwindowSize. {$}",in.c_str());
 
 	ResDataObject json;
 	json.decode(in.c_str());
@@ -47,7 +48,7 @@ RET_STATUS nsFPD::SyncUnit::JSSetXwindowSize(std::string in, std::string & out)
 
 RET_STATUS nsFPD::SyncUnit::JSSetFrameRate(std::string in, std::string& out)
 {
-	////mLog::FINFO("JSSetFrameRate. {$}",in.c_str());
+	//FINFO("JSSetFrameRate. {$}",in.c_str());
 
 	ResDataObject json;
 	json.decode(in.c_str());
@@ -58,7 +59,7 @@ RET_STATUS nsFPD::SyncUnit::JSSetFrameRate(std::string in, std::string& out)
 
 RET_STATUS nsFPD::SyncUnit::JSSetSyncMode(std::string in, std::string & out)
 {
-	////mLog::FINFO("JSSetSyncMode. {$}",in.c_str());
+	//FINFO("JSSetSyncMode. {$}",in.c_str());
 
 	ResDataObject json;
 	json.decode(in.c_str());
@@ -127,13 +128,13 @@ RET_STATUS nsFPD::SyncUnit::JSGetSyncMode(std::string& out)
 
 RET_STATUS nsFPD::SyncUnit::JSPrepareAcquisition(std::string in, std::string& out)
 {
-	////mLog::FINFO("JSPrepareAcquisition.");
+	//FINFO("JSPrepareAcquisition.");
 	return PrepareAcquisition();
 }
 
 RET_STATUS nsFPD::SyncUnit::JSStartAcquisition(std::string in, std::string& out)
 {
-	////mLog::FINFO("JSStartAcquisition.");
+	//FINFO("JSStartAcquisition.");
 	ResDataObject json;
 	json.decode(in.c_str());
 	if (json.GetFirstOf("P0") >= 0)
@@ -143,14 +144,14 @@ RET_STATUS nsFPD::SyncUnit::JSStartAcquisition(std::string in, std::string& out)
 	}
 	else 
 	{
-		////mLog::FINFO("JSStartAcquisition param in is null but it's not error!");
+		//FINFO("JSStartAcquisition param in is null but it's not error!");
 		return StartAcquisition();
 	}
 }
 
 RET_STATUS nsFPD::SyncUnit::JSStopAcquisition(std::string in, std::string& out)
 {
-	////mLog::FINFO("JSStopAcquisition.");
+	//FINFO("JSStopAcquisition.");
 	return StopAcquisition();
 }
 
@@ -162,7 +163,7 @@ RET_STATUS nsFPD::SyncUnit::JSGetFPDReady(std::string & out)
 
 RET_STATUS nsFPD::SyncUnit::JSSetFPDReady(std::string in)
 {
-	////mLog::FINFO("JSSetFPDReady in:{$}", in);
+	//FINFO("JSSetFPDReady in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -219,7 +220,7 @@ RET_STATUS nsFPD::SyncUnit::JSGetXWindowStatus(std::string & out)
 
 RET_STATUS nsFPD::SyncUnit::JSSetXWindowStatus(std::string in)
 {
-	////mLog::FINFO("JSSetXWindowStatus in:{$}", in);
+	//FINFO("JSSetXWindowStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -230,7 +231,7 @@ RET_STATUS nsFPD::SyncUnit::JSSetXWindowStatus(std::string in)
 
 void OEM_NOTIFY nsFPD::SyncUnit::XWindowOnNotify()
 {
-	////mLog::FINFO("XWindowOnNotify");
+	//FINFO("XWindowOnNotify");
 	auto szFDinfo = std::to_string(XWINDOW_ON);
 	m_strXwindowStatus = szFDinfo;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::XwindowStatus, m_strXwindowStatus);
@@ -238,7 +239,7 @@ void OEM_NOTIFY nsFPD::SyncUnit::XWindowOnNotify()
 
 void OEM_NOTIFY nsFPD::SyncUnit::XWindowOffNotify()
 {
-	////mLog::FINFO("XWindowOffNotify");
+	//FINFO("XWindowOffNotify");
 	auto szFDinfo = std::to_string(XWINDOW_OFF);
 	m_strXwindowStatus = szFDinfo;
 	m_EventCenter->OnNotify((int)ATTRACTION_SET, AttrKey::XwindowStatus, m_strXwindowStatus);
@@ -269,7 +270,7 @@ RET_STATUS nsFPD::SyncUnit::JSGetImageReadingStatus(std::string & out)
 
 RET_STATUS nsFPD::SyncUnit::JSSetImageReadingStatus(std::string in)
 {
-	////mLog::FINFO("JSSetImageReadingStatus in:{$}", in);
+	//FINFO("JSSetImageReadingStatus in:{$}", in);
 	if (in == "")
 	{
 		return RET_STATUS::RET_FAILED;
@@ -292,7 +293,7 @@ RET_STATUS nsFPD::SyncUnit::GetSyncMode(SYNC_MODE& nSyncMode)
 RET_STATUS nsFPD::SyncUnit::JSGetExpReadyStatus(std::string& out)
 {
 	out = m_strFPDExpReady;
-	////mLog::FINFO("JSGetExpReadyStatus {$}", out);
+	//FINFO("JSGetExpReadyStatus {$}", out);
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -311,7 +312,7 @@ RET_STATUS nsFPD::SyncUnit::SetFrameRate(float fFrameRate)
 RET_STATUS nsFPD::SyncUnit::JSGetSupportSyncMode(std::string& out)
 {
 	out = m_strSupportSyncMode;
-	////mLog::FINFO("JSGetSupportSyncMode {$}", out);
+	//FINFO("JSGetSupportSyncMode {$}", out);
 	return RET_STATUS::RET_SUCCEED;
 }
 
@@ -323,14 +324,14 @@ RET_STATUS nsFPD::SyncUnit::JSUpdateGENERATORSYNCSTATE(std::string in, std::stri
 
 RET_STATUS nsFPD::SyncUnit::SetSupportSyncMode(string in)
 {
-	////mLog::FINFO("SetSupportSyncMode {$}", in);
+	//FINFO("SetSupportSyncMode {$}", in);
 	m_strSupportSyncMode = in;
 	return RET_STATUS::RET_SUCCEED;
 }
 
 RET_STATUS nsFPD::SyncUnit::JSActiveSyncMode(std::string in, std::string& out)
 {
-	////mLog::FINFO("JSActiveSyncMode in:{$}", in);
+	//FINFO("JSActiveSyncMode in:{$}", in);
 	ResDataObject json;
 	json.decode(in.c_str());
 	if (json.GetFirstOf("SyncMode") >= 0)
@@ -351,15 +352,15 @@ RET_STATUS nsFPD::SyncUnit::JSActiveSyncMode(std::string in, std::string& out)
 		}
 		else 
 		{
-			////mLog::FERROR("not support this sync mode!");
+			//FERROR("not support this sync mode!");
 			return RET_STATUS::RET_FAILED;
 		}
-		////mLog::FINFO("nSyncMode:{$}", nSyncMode);
+		//FINFO("nSyncMode:{$}", nSyncMode);
 		return ActiveSyncMode(nSyncMode);
 	}
 	else
 	{
-		////mLog::FERROR("JSActiveSyncMode param is invalid!");
+		//FERROR("JSActiveSyncMode param is invalid!");
 		return RET_STATUS::RET_FAILED;
 	}
 }

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPDDeviceMould.cpp

@@ -5,13 +5,14 @@
 #include "EasyJSONEncoder.hpp"
 #include "CCOS.Dev.FPDDeviceMould.hpp"
 #include "common_api.h"
+#include "Log4CPP.h"
 
 using namespace CCOS::Dev::Detail::Detector;
 namespace nsFPD = CCOS::Dev::Detail::Detector;
 
 extern const char* g_szMouldPath;
 
-//Log4CPP::Logger* ////mLog::gLogger = nullptr;
+//Log4CPP::Logger* //gLogger = nullptr;
 
 
 template <typename _Container, typename T>
@@ -24,19 +25,15 @@ inline _Container & operator << (_Container & ar, const T & t)
 FPDDeviceMould::FPDDeviceMould()
 {
 	m_strIODevicePath = "/Detector";
-//	if (//mLog::gLogger == nullptr)
-//	{
-//		string strLogPath = GetProcessDirectory() + R"(\Conf\Log4CPP.Config.xml)";
-//		auto rc = Log4CPP::LogManager::LoadConfigFile(strLogPath.c_str());
-//		////mLog::gLogger = Log4CPP::LogManager::GetLogger("Module");
+
+	string strLogPath = GetProcessDirectory() + R"(\Conf\log_config.xml)";
+	// 初始化日志系统
+	if (!Log4CPP::init(logHostName, "FPD.Modle", strLogPath, true)) {
+		std::cerr << "Failed to initialize log system! Using default configuration." << std::endl;
+		// 即使配置文件加载失败，也可以继续使用默认配置
+	}
 //
-//		////mLog::FINFO("Code Build datetime [{$} {$}]", __DATE__, __TIME__);
-//#ifdef _WIN64
-//		////mLog::FINFO("=============================Version: {$} (64-bit)==================================", FileVersion(g_szMouldPath).GetVersionString());
-//#else
-//		////mLog::FINFO("=============================Version: {$} (32-bit)==================================", FileVersion(g_szMouldPath).GetVersionString());
-//#endif
-//	}
+	FINFO("Code Build datetime [{$} {$}]", __DATE__, __TIME__);
 }
 
 FPDDeviceMould::~FPDDeviceMould()

Detector/CCOS.Dev.FPDDeviceMould/CCOS.Dev.FPDDeviceMould.hpp

@@ -688,7 +688,7 @@ namespace CCOS::Dev::Detail::Detector
 	public:
 		FPDDeviceMould();
 		~FPDDeviceMould();
-
+		string logHostName = "FPDDeviceMould";
 		//protected:
 
 		//	virtual void RegisterCtrl();

Detector/CCOS.Dev.FPDDeviceMould/CMakeLists.txt

@@ -86,18 +86,24 @@ add_custom_command(TARGET CCOS.Dev.FPDDeviceMould POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${DELIVER_DIR}/lib"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${DELIVER_DIR}/bin"
     
-     # 复制主库文件 (libDPC.so.1.0.0)
+    # 复制核心库文件（唯一真实二进制文件，如 libCCOS.Dev.FPDDeviceMould.so.1.0.0）
+    COMMAND ${CMAKE_COMMAND} -E echo "复制CCOS.Dev.FPDDeviceMould核心库文件..."
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "$<TARGET_FILE:CCOS.Dev.FPDDeviceMould>"
         "${DELIVER_DIR}/lib"
     
-    # 复制符号链接 (libDPC.so 和 libDPC.so.1)
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_LINKER_FILE:CCOS.Dev.FPDDeviceMould>"
-        "${DELIVER_DIR}/lib"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_SONAME_FILE:CCOS.Dev.FPDDeviceMould>"
-        "${DELIVER_DIR}/lib"
+    # 创建主版本符号链接（如 libCCOS.Dev.FPDDeviceMould.so.1 -> 完整版本库文件）
+    COMMAND ${CMAKE_COMMAND} -E echo "创建CCOS.Dev.FPDDeviceMould主版本符号链接..."
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "$<TARGET_FILE_NAME:CCOS.Dev.FPDDeviceMould>"  # 链接指向的目标（核心库文件名）
+        "${DELIVER_DIR}/lib/$<TARGET_SONAME_FILE_NAME:CCOS.Dev.FPDDeviceMould>"  # 链接文件本身（主版本名）
+    
+    # 创建通用符号链接（如 libCCOS.Dev.FPDDeviceMould.so -> 主版本链接）
+    COMMAND ${CMAKE_COMMAND} -E echo "创建CCOS.Dev.FPDDeviceMould通用符号链接..."
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "$<TARGET_SONAME_FILE_NAME:CCOS.Dev.FPDDeviceMould>"  # 链接指向的目标（主版本链接名）
+        "${DELIVER_DIR}/lib/$<TARGET_LINKER_FILE_NAME:CCOS.Dev.FPDDeviceMould>"  # 链接文件本身（通用名）
+
     
     # 复制头文件
     COMMAND ${CMAKE_COMMAND} -E echo "复制头文件..."

Detector/TiRay/CCOS.Dev.FPD.TiRayDR/CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.12)
 project(CCOS.Dev.FPD.TiRayDR VERSION 1.0.0 LANGUAGES CXX)
 
 # 设置 C++ 标准
-# set(CMAKE_CXX_STANDARD 17)
-# set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 # 配置输出目录
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -91,7 +91,7 @@ endif()
 
 # 链接依赖库
 if(UNIX AND NOT APPLE)
-    target_link_libraries(CCOS.Dev.FPD.TiRayDR PRIVATE common_api CCOS.Dev.IODevice CCOS.Dev.FPDDeviceMould)
+    target_link_libraries(CCOS.Dev.FPD.TiRayDR PRIVATE common_api CCOS.Dev.IODevice CCOS.Dev.FPDDeviceMould log4cpp_wrapper)
     message(STATUS "已链接: CCOS.Dev.IODevice CCOS.Dev.FPDDeviceMould ")
 endif()
 
@@ -111,18 +111,24 @@ add_custom_command(TARGET CCOS.Dev.FPD.TiRayDR POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${DELIVER_DIR}/lib"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${DELIVER_DIR}/bin"
     
-     # 复制主库文件 (libDPC.so.1.0.0)
+    # 复制核心库文件（唯一真实二进制文件，如 libCCOS.Dev.FPD.TiRayDR.so.1.0.0）
+    COMMAND ${CMAKE_COMMAND} -E echo "复制CCOS.Dev.FPD.TiRayDR核心库文件..."
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "$<TARGET_FILE:CCOS.Dev.FPD.TiRayDR>"
         "${DELIVER_DIR}/lib"
     
-    # 复制符号链接 (libDPC.so 和 libDPC.so.1)
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_LINKER_FILE:CCOS.Dev.FPD.TiRayDR>"
-        "${DELIVER_DIR}/lib"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_SONAME_FILE:CCOS.Dev.FPD.TiRayDR>"
-        "${DELIVER_DIR}/lib"
+    # 创建主版本符号链接（如 libCCOS.Dev.FPD.TiRayDR.so.1 -> 完整版本库文件）
+    COMMAND ${CMAKE_COMMAND} -E echo "创建CCOS.Dev.FPD.TiRayDR主版本符号链接..."
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "$<TARGET_FILE_NAME:CCOS.Dev.FPD.TiRayDR>"  # 链接指向的目标（核心库文件名）
+        "${DELIVER_DIR}/lib/$<TARGET_SONAME_FILE_NAME:CCOS.Dev.FPD.TiRayDR>"  # 链接文件本身（主版本名）
+    
+    # 创建通用符号链接（如 libCCOS.Dev.FPD.TiRayDR.so -> 主版本链接）
+    COMMAND ${CMAKE_COMMAND} -E echo "创建CCOS.Dev.FPD.TiRayDR通用符号链接..."
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "$<TARGET_SONAME_FILE_NAME:CCOS.Dev.FPD.TiRayDR>"  # 链接指向的目标（主版本链接名）
+        "${DELIVER_DIR}/lib/$<TARGET_LINKER_FILE_NAME:CCOS.Dev.FPD.TiRayDR>"  # 链接文件本身（通用名）
+    
     
     # 复制头文件
     COMMAND ${CMAKE_COMMAND} -E echo "复制头文件..."

Detector/TiRay/CCOS.Dev.FPD.TiRayDR/DetectorConfiguration.cpp

@@ -15,11 +15,11 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 {
 	if (!m_ConfigAll.loadFile(m_strConfigPath.c_str()))
 	{
-		//mLog::FERROR("load {$} fail!", m_strConfigPath);
+		FERROR("load {$} fail!", m_strConfigPath);
 		return false;
 	}
 
-	//mLog::FINFO("load {$} Success!", m_strConfigPath);
+	FINFO("load {$} Success!", m_strConfigPath);
 
 	try
 	{
@@ -30,7 +30,7 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 		DeviceConf.strDeviceName = (string)m_Configurations[DetectorDescription];
 		int maxImageSize = 0;
 		int nModeCount = (int)m_Configurations["ModeTable"].size();
-		//mLog::FINFO("ModeCount:{$},ModeTable:{$}", nModeCount, m_Configurations["ModeTable"].encode());
+		FINFO("ModeCount:{$},ModeTable:{$}", nModeCount, m_Configurations["ModeTable"].encode());
 		DeviceConf.nNotifyStatusTimePeriod = (int)m_Configurations["NotifyStatusTimePeriod"];
 		DeviceConf.nReconnectTimePeriod = (int)m_Configurations["ReConnectTimePeriod"];
 		DeviceConf.strLastCalibrationDate = (string)m_Configurations["LastCalibrationDate"];
@@ -38,10 +38,10 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 		DeviceConf.strPanelSerial = (string)m_Configurations["SerialNumber"];
 		DeviceConf.strDetectorWiredIP = (string)m_Configurations["DetectorWiredIP"];
 		DeviceConf.strDetectorWirelessIP = (string)m_Configurations["DetectorWirelessIP"];
-		//mLog::FINFO("LastCalibrationDate:{$},CalibrationFileExpireTime:{$}", DeviceConf.strLastCalibrationDate, DeviceConf.strCalibrationFileExpireTime);
+		FINFO("LastCalibrationDate:{$},CalibrationFileExpireTime:{$}", DeviceConf.strLastCalibrationDate, DeviceConf.strCalibrationFileExpireTime);
 		for (int i = 0; i < nModeCount; i++)
 		{
-			//mLog::FINFO("ModeTable[{$}]:{$}", i, m_Configurations["ModeTable"][i].encode());
+			FINFO("ModeTable[{$}]:{$}", i, m_Configurations["ModeTable"][i].encode());
 			DeviceConf.nRawWidth = m_Configurations["ModeTable"][i]["RawImgWidth"];
 			DeviceConf.nRawHeight = m_Configurations["ModeTable"][i]["RawImgHeight"];
 			DeviceConf.nDoseOfEXI = (int)m_Configurations["ModeTable"][i]["Sensitivity"];
@@ -52,7 +52,7 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 				DeviceConf.nMaxImageHeight = DeviceConf.nRawHeight;
 			}
 		}
-		//mLog::FINFO("DeviceConf.nMaxImageWidth:{$},DeviceConf.nMaxImageHeight:{$}", DeviceConf.nMaxImageWidth, DeviceConf.nMaxImageHeight);
+		FINFO("DeviceConf.nMaxImageWidth:{$},DeviceConf.nMaxImageHeight:{$}", DeviceConf.nMaxImageWidth, DeviceConf.nMaxImageHeight);
 
 		int nTemp = (int)m_Configurations["SupportDDR"];
 		if (nTemp == 1)
@@ -76,7 +76,7 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 
 		DeviceConf.strSupportSyncMode = m_Configurations["SupportSyncMode"].encode();
 		DeviceConf.nCalibMode = (int)m_Configurations["CalibMode"];
-		//mLog::FINFO("SupportSyncMode:{$},CalibMode:{$}", DeviceConf.strSupportSyncMode, DeviceConf.nCalibMode);
+		FINFO("SupportSyncMode:{$},CalibMode:{$}", DeviceConf.strSupportSyncMode, DeviceConf.nCalibMode);
 
 		int nDoseList = (int)m_Configurations["CalibrationConfig"].size();
 		for (int i = 0; i < nDoseList; i++)
@@ -94,7 +94,7 @@ bool DetectorConfiguration::LoadConfigurations(DeviceIndexStruct & DeviceConf, R
 	}
 	catch (ResDataObjectExption &e)
 	{
-		//mLog::FERROR("Get config error: {$}", e.what());
+		FERROR("Get config error: {$}", e.what());
 		return false;
 	}
 	return true;