Selaa lähdekoodia

Z991239-6179 #comment:日志优化

80274480 5 kuukautta sitten
vanhempi
sitoutus
d2e514c518

+ 0 - 1
Module/mod_counterconnector/mod_counterconnector.cpp

@@ -637,7 +637,6 @@ void CCounterConnectorEntity ::OnReceivePkt(int type, int sub_type, const char *
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown sub_type %d from agent!", sub_type);
 			break;
 		}
-
 	}
 	else if (type == ACM_TYPE_CALLTRANS)
 	{

+ 2 - 2
Module/mod_countercontext/mod_countercontext.cpp

@@ -133,9 +133,9 @@ public:
 			buf& level16;
 			evt.level = CSimpleString16Bit2A(level16);
 #endif //RVC_OS_WIN
-
 			SpSendBroadcast(GetFunction(), SP_MSG_OF(CounterBasicInfo), SP_MSG_SIG_OF(CounterBasicInfo), evt);
-		} else {
+		} 
+		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown sub_type %d from agent!", sub_type);
 		}
 	}

+ 12 - 9
Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -163,10 +163,10 @@ DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
 	CSystemStaticInfo stStaticinfo;
 	spFunction->GetSystemStaticInfo(stStaticinfo);
 
-	if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
+	if (_stricmp(stStaticinfo.strMachineType.GetData(), "RVC.Stand1SPlus") == 0) {
 		eType = eStand1SPlusType;
 	}
-	else if (stricmp(stStaticinfo.strMachineType, "RVC.CardStore") == 0 || stricmp(stStaticinfo.strMachineType, "RVC.CardPrinter") == 0) {
+	else if (_stricmp(stStaticinfo.strMachineType.GetData(), "RVC.CardStore") == 0 || _stricmp(stStaticinfo.strMachineType.GetData(), "RVC.CardPrinter") == 0) {
 		eType = eCardStore;
 	}
 	else {
@@ -239,14 +239,12 @@ ErrorCodeEnum CITCtrlEntity::__OnClose(ErrorCodeEnum preOperationError)
 	CSmartPointer<IEntityFunction> pFunc = GetFunction();
 	pFunc->UnregistSysVarEvent("UIState");
 	pFunc->UnregistSysVarEvent("CustomerHandle");
-	if (eStand1SPlusType == m_eDeviceType)
-	{
+	if (eStand1SPlusType == m_eDeviceType){
 		pFunc->UnregistSysVarEvent(SYSVAR_CAMERASTATE);
 	}
 
 	if (NULL != m_pChannelClient) {
 		m_pChannelClient->GetFunction()->CloseSession();
-
 		m_pChannelClient = NULL;
 	}
 
@@ -289,16 +287,20 @@ void CITCtrlEntity::BcastCustomerState(const char *pszValue,const char *pszOldVa
 	if (pszValue[0] == 'N') { // None
 		evt.state = eCustomerState_None;
 		evt.status = L"Customer:None";
-	} else if (pszValue[0] == 'A') { // Attention
+	} 
+	else if (pszValue[0] == 'A') { // Attention
 		evt.state = eCustomerState_Attention;
 		evt.status = L"Customer:Attention";
-	} else if (pszValue[0] == 'C') { // Control
+	}
+	else if (pszValue[0] == 'C') { // Control
 		evt.state = eCustomerState_Control;
 		evt.status = L"Customer:Control";
-	} else if (pszValue[0] == 'T') { // Assist
+	}
+	else if (pszValue[0] == 'T') { // Assist
 		evt.state = eCustomerState_Assist;
 		evt.status = L"Customer:Assist";
-	} else if (pszValue[0] == 'G') { // Agent
+	}
+	else if (pszValue[0] == 'G') { // Agent
 		evt.state = eCustomerState_AgentOperation;
 		evt.status = L"Customer:AgentOperation";
 	} 
@@ -306,6 +308,7 @@ void CITCtrlEntity::BcastCustomerState(const char *pszValue,const char *pszOldVa
 		ok = 0;
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("bug! OnSysVarEvent unknown %s", pszValue);
 	}
+
 	GetFunction()->GetSysVar("SessionID",m_SessionID);
 	evt.session_id = CSimpleStringA2W(m_SessionID);
 	if (ok) {

+ 1 - 4
Module/mod_livenessdetection/RvcFaceVideo.cpp

@@ -65,7 +65,7 @@ RvcFaceVideo::~RvcFaceVideo(void)
 	}
 
 	if (NULL != m_preview_env_videoframe){
-		delete m_preview_env_videoname;
+		delete []m_preview_env_videoname;
 		m_preview_env_videoframe = NULL;
 	}
 
@@ -79,8 +79,6 @@ RvcFaceVideo::~RvcFaceVideo(void)
 int RvcFaceVideo::InitVideoQueue(const char* strenvqueue, const char* stroptqueue, const char* strpreview_envqueue, const char* strpreview_optqueue)
 {
 	int iRet = -1;
-	
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin new copy video queue name.");
 
 	if (NULL != strenvqueue){
 		rvc_snprintf(m_env_videoname, MAX_PATH, "%s", strenvqueue);
@@ -98,7 +96,6 @@ int RvcFaceVideo::InitVideoQueue(const char* strenvqueue, const char* stroptqueu
 		rvc_snprintf(m_preview_opt_videoname, MAX_PATH, "%s", strpreview_optqueue);
 	}
 
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin new video queue.");
 	if (strlen(m_env_videoname)){
 		m_env_videoqueue = new Clibvideoqueue(m_env_videoname);
 		iRet = 0;