Z991239-4792 #comment 增加单屏机型

Module/include/EventCode.h

@@ -35,7 +35,8 @@ enum DeviceTypeEnum
 	eCardStore=5,				//卡库
 	eDesk1SType =6,				//低柜单屏版，单摄像头
 	eDesk2SIntegratedType =7,	//低柜一体机，单摄像头	
-	eCardPrinter                //卡库即时制卡
+	eCardPrinter = 8,           //卡库即时制卡
+	eStand1SPlusType =9			//UOS单屏版，单摄像头			
 };
 
 static const char* Device_Type_Table[] = {
@@ -47,7 +48,8 @@ static const char* Device_Type_Table[] = {
 	"eCardStore",				//卡库
 	"eDesk1SType",				//低柜单屏版，单摄像头
 	"eDesk2SIntegratedType",	//低柜一体机，单摄像头	
-	"eCardPrinter"              //卡库即时制卡
+	"eCardPrinter",             //卡库即时制卡
+	"eStand1SPlusType"			//UOS单屏版，单摄像头
 };
 
 /*国产化新增开始*/

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -1565,8 +1565,10 @@ DeviceTypeEnum CSalesRecorderEntity::RvcGetDeviceType()
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
 	m_terminalNo = stStaticinfo.strTerminalID;
-
-	if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_assistantchannel/mod_assistantchannel.cpp

@@ -137,7 +137,10 @@ DeviceTypeEnum CBizChannelEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (_stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0){
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (_stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0){
 		if (_stricmp(stStaticinfo.strSite,"CMB.FLB")==0){
 			eType = eMobilePadType;
 		}

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -59,12 +59,13 @@ ErrorCodeEnum CCounterConnectorEntity ::__OnStart(ErrorCodeEnum preOperationErro
 	else{
 		m_bIsPadType = FALSE;
 	}
-	m_IsStand2SType = TRUE;
-	if (_stricmp(stStaticinfo.strMachineType,"RVC.Stand2S")!=0){
-		m_IsStand2SType = FALSE;
-	}
+
+	m_IsStandType = TRUE;
 
 	DeviceTypeEnum eDeviceType = RvcGetDeviceType();
+	if (eStand1SPlusType != eDeviceType && eStand2sType != eDeviceType) {
+		m_IsStandType = FALSE;
+	}
 
 	m_fsm.Init(this);
 	m_fsm.m_bIsPadDevice = (eMobilePadType == eDeviceType) ? TRUE : FALSE;
@@ -784,7 +785,7 @@ void CCounterConnectorEntity::Handle_StartRemoteRecord(const char* pszMessage)
 void CCounterConnectorEntity::StopRemoteRecordSpeakerAudioCapture()
 {
 	if(DOUBLERECORD_CALLTYPE == m_fsm.m_CallingParam.nCallType){
-		if (TRUE == m_IsStand2SType){
+		if (TRUE == m_IsStandType){
 			if (FALSE == m_bIsRemoteRecordStopSpeakerCapture){
 				if (Error_Succeed == m_fsm.StopSpeakerAudioCapture()){
 					m_bIsRemoteRecordStopSpeakerCapture = TRUE;
@@ -868,7 +869,10 @@ DeviceTypeEnum CCounterConnectorEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (_stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_counterconnector/mod_counterconnector.h

@@ -103,7 +103,7 @@ public:
 
 private:
 	BOOL m_bIsPadType;
-	BOOL m_IsStand2SType;
+	BOOL m_IsStandType;
 	ChannelCounterConnectorClient*m_pCounterConnectorChannel;
 	CAutoArray<CUUID> m_arrListener;
 	CUUID m_uidlivenessListener;

Module/mod_countercontext/mod_countercontext.cpp

@@ -132,7 +132,7 @@ public:
 
 			//evt.Serialize(buf);
 			SpSendBroadcast(GetFunction(), SP_MSG_OF(CounterBasicInfo), SP_MSG_SIG_OF(CounterBasicInfo), evt);
-			Dbg("SpSendBroadcast CounterBasicInfo and callid = %s, name = %s, workNumber = %s, level = %s, skillCode = %s, skillDesc = %s.", evt.callid.GetData(), evt.name.GetData(), evt.workNumber.GetData(), evt.level.GetData(), evt.skillCode.GetData(), evt.skillDesc.GetData());
+			//Dbg("SpSendBroadcast CounterBasicInfo and callid = %s, name = %s, workNumber = %s, level = %s, skillCode = %s, skillDesc = %s.", evt.callid.GetData(), evt.name.GetData(), evt.workNumber.GetData(), evt.level.GetData(), evt.skillCode.GetData(), evt.skillDesc.GetData());
 
 		} else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown sub_type %d from agent!", sub_type);

Module/mod_customeraware/mod_customeraware.cpp

@@ -52,9 +52,10 @@ public:
 
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError)
 	{
-		if (preOperationError != Error_Succeed)
+		if (preOperationError != Error_Succeed) {
 			return preOperationError;
-
+		}
+			
 		getDeviceType();
 		m_customerBegingFSM.Init(this);
 		m_customerHandleFSM.Init(this);
@@ -92,7 +93,7 @@ public:
 		Error = GetFunction()->RegistSysVarEvent("CustomerID", this);
 		if (Error != Error_Succeed) 
 		{
-			LOG_TRACE("register sysvar %s failed!", "CustomerID");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerID");
 		}
 		return Error_Succeed;
 	}
@@ -118,24 +119,24 @@ public:
 		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
 		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext& pLinkInfo)
 	{
-		LOG_TRACE("user_code = %08x", dwUserCode);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("user_code = %08x", dwUserCode);
 		//是否进入客户经理录像
 		if (dwUserCode == LOG_EVT_UI_STARTRECORD || LOG_EVT_UI_STARTRECORDPREVIEW == dwUserCode)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Enter sales record!");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Enter sales record!");
 			m_customerHandleFSM.m_bIsSalesRecord = TRUE;
 			m_customerHandleFSM.PostEventFIFO(new FSMEvent(USER_EVT_INTO_CUSTOMERRECORD));
 		} 
 		else if(LOG_EVT_UI_STARTREMOTERECORD == dwUserCode)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Enter sales remote record!");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Enter sales remote record!");
 			m_customerHandleFSM.m_bIsSalesRecord = TRUE;
 			m_customerHandleFSM.PostEventFIFO(new FSMEvent(USER_EVT_INTO_CUSTOMERRECORD));
 		} 
 		//是否在客户经理录像的时候退出到了首页，进入有人接近状态
 		else if (dwUserCode == LOG_EVT_UI_RETURNMENU||dwUserCode == LOG_EVT_UI_EXITSALESRECORD)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("exit to main!");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("exit to main!");
 			if (m_customerHandleFSM.m_bIsSalesRecord)
 			{
 				m_customerHandleFSM.m_bIsSalesRecord = FALSE;
@@ -166,10 +167,10 @@ public:
 	{
 		if (_stricmp(pszKey, SYSVAR_DESKTOPTYPE) == 0)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("desktop type from : %c to %c", pszOldValue[0], pszValue[0]);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("desktop type from : %c to %c", pszOldValue[0], pszValue[0]);
 			//不再进入客户感知用户桌面状态，解决用户桌面态返回main页面问题
 			if (m_eDeviceType != eDesk2SType) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("DeviceType:%d customeraware not go to USERDESKTOP state", m_eDeviceType);
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("DeviceType:%d customeraware not go to USERDESKTOP state", m_eDeviceType);
 				return;
 			}
 
@@ -222,7 +223,10 @@ private:
 		CSmartPointer<IEntityFunction> spFunction = GetFunction();
 		CSystemStaticInfo stStaticinfo;
 		spFunction->GetSystemStaticInfo(stStaticinfo);
-		if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0)
+		if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+			m_eDeviceType = eStand1SPlusType;
+		}
+		else if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0)
 		{
 			if (stricmp(stStaticinfo.strSite, "CMB.FLB") == 0)
 			{

Module/mod_evtconverter/mod_evtconverter.cpp

@@ -25,7 +25,7 @@ public:
 		{
 			LOG_FUNCTION();
 		}
-		m_eDeviceType = eStand2sType;  //add by chh
+		m_eDeviceType = eStand2sType; 
 		m_nIslog = 1;
 		ErrorCodeEnum Error;
 		CSimpleStringA str;
@@ -34,39 +34,42 @@ public:
 		//is Pad Version
 		CSystemStaticInfo stStaticinfo;
 		spEntityFunction->GetSystemStaticInfo(stStaticinfo);
-		LOG_TRACE("stStaticinfo.strMachineType = %s",stStaticinfo.strMachineType.GetData());
-		if (stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0)
+
+		if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+			m_eDeviceType = eStand1SPlusType;
+		}
+		else if (stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0)
 		{
 			if (stricmp(stStaticinfo.strSite,"CMB.FLB")==0)
 			{
-				LOG_TRACE("the type is mobile pad");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is mobile pad");
 				m_eDeviceType = eMobilePadType;
 			}
 			else
 			{
-				LOG_TRACE("the type is pad");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is pad");
 				m_eDeviceType = ePadtype;
 			}
 		}
 		else if (stricmp(stStaticinfo.strMachineType,"RPM.Stand1S")==0)
 		{
-			LOG_TRACE("the type is RPM.Stand1S");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is RPM.Stand1S");
 			m_eDeviceType = eRpm1sType;
 		}
 		else if (stricmp(stStaticinfo.strMachineType,"RVC.CardStore")==0)
 		{
-			LOG_TRACE("the type is RVC.CardStore");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is RVC.CardStore");
 			m_eDeviceType = eCardStore;
 		}
 		else
 		{
-			LOG_TRACE("the type is standard");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is standard");
 			m_eDeviceType = eStand2sType;
 		}
         CSimpleStringA strConfigDir;
         Error = spEntityFunction->GetPath("CFG", strConfigDir);
         if (Error != Error_Succeed) {
-            LOG_TRACE("get etc directory failed!");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get etc directory failed!");
             return Error;
         }
 		CAutoArray<CSimpleStringA> ConfigFiles;

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -120,7 +120,11 @@ DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (_stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_livenessdetection/mod_livenessdetection.cpp

@@ -86,32 +86,35 @@ ErrorCodeEnum CLivenessDetectionEntity::__OnStart(ErrorCodeEnum preOperationErro
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0)
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		m_eDeviceType = eStand1SPlusType;
+	}
+	else if (stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0)
 	{		
 		if (stricmp(stStaticinfo.strSite,"CMB.FLB")==0)
 		{
-			LOG_TRACE("the type is mobile pad");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is mobile pad");
 			m_eDeviceType = eMobilePadType;
 		}
 		else
 		{
-			LOG_TRACE("the type is pad");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is pad");
 			m_eDeviceType = ePadtype;
 		}
 	}
 	else if (stricmp(stStaticinfo.strMachineType,"RPM.Stand1S")==0) 
 	{
-		LOG_TRACE("the type is rpm.stand1s");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is rpm.stand1s");
 		m_eDeviceType = eRpm1sType;
 	}
 	else if (stricmp(stStaticinfo.strMachineType,"RVC.Desk2S")==0)
 	{
-		LOG_TRACE("the type is Desk2S");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is Desk2S");
 		m_eDeviceType = eDesk2SType;
 	}
 	else
 	{
-		LOG_TRACE("the type is standard");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the type is standard");
 		m_eDeviceType = eStand2sType;
 	}
 
@@ -126,7 +129,7 @@ ErrorCodeEnum CLivenessDetectionEntity::__OnStart(ErrorCodeEnum preOperationErro
 	int nCameraCount = 0;
 	Error = DecideCameraCount(nCameraCount);
 	if (Error != Error_Succeed || nCameraCount < 0 || nCameraCount > 2) {
-		LOG_TRACE("decide camera count failed!");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("decide camera count failed!");
 		return Error;
 	}
 	

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -1608,7 +1608,10 @@ DeviceTypeEnum CLocalMediaPlayEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -366,7 +366,10 @@ DeviceTypeEnum CMediaControllerEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (_stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_recorder/mod_recorder.cpp

@@ -444,7 +444,10 @@ DeviceTypeEnum CRecorderEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (_stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (_stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_sipphone/mod_sipphone.cpp

@@ -2141,7 +2141,10 @@ DeviceTypeEnum CSIPEntity::RvcGetDeviceType()
 	CSmartPointer<IEntityFunction> spFunction = GetFunction();
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
-	if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+		eType = eStand1SPlusType;
+	}
+	else if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 		if (stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 			eType = eMobilePadType;
 		}

Module/mod_snapshot/mod_snapshot.cpp

@@ -377,7 +377,10 @@ public:
 		CSmartPointer<IEntityFunction> spFunction = GetFunction();
 		CSystemStaticInfo stStaticinfo;
 		spFunction->GetSystemStaticInfo(stStaticinfo);
-		if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
+		if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+			eType = eStand1SPlusType;
+		}
+		else if (stricmp(stStaticinfo.strMachineType, "RVC.PAD") == 0) {
 			if (stricmp(stStaticinfo.strSite, "CMB.FLB") == 0) {
 				eType = eMobilePadType;
 			}