Z991239-6069 #comment 日志优化

Module/mod_initiativetransfer/FlowControlFSM.cpp

@@ -13,11 +13,12 @@
 #define LOG_ERR_S5_REQAGENTFLOW_FAILED 		0x30500087
 #define LOG_ERR_S7_ENTRY 					0x30500088
 #define LOG_ERR_S1_ASSIS_IDEL	 			0x30500089
-#define LOG_ERR_S2_ASSIS_IDEL	 			0x3050008a
-#define LOG_ERR_S3_ASSIS_IDEL	 			0x3050008b
-#define LOG_ERR_S5_ASSIS_IDEL	 			0x3050008c
-#define LOG_EVT_CONNEC_ASSISTCHAN_FAILED	0x3050008d
-
+#define LOG_ERR_S2_ASSIS_IDEL	 			0x3050008A
+#define LOG_ERR_S3_ASSIS_IDEL	 			0x3050008B
+#define LOG_ERR_S5_ASSIS_IDEL	 			0x3050008C
+#define LOG_EVT_CONNEC_ASSISTCHAN_FAILED	0x3050008D
+#define LOG_ERR_S2_CHAN_OFF					0x3050008E
+#define LOG_ERR_S3_CHAN_OFF					0x3050008F
 
 void ChannelClient::OnMessage( ErrorCodeEnum Error, ChannelService_State_Info &Msg, CSmartPointer<IReleasable> pData )
 {
@@ -243,6 +244,7 @@ unsigned int CFlowControlFSM::s2_on_event(FSMEvent* event)
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
+		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S2_CHAN_OFF, "s2 chan off.");
 	} 
 	else if (event->iEvt == USER_EVT_ANSAGENTFLOW) {
 		AnsAgentFlowEvent *afe = static_cast<AnsAgentFlowEvent*>(event);
@@ -315,15 +317,18 @@ unsigned int CFlowControlFSM::s3_on_event(FSMEvent* event)
 #endif //RVC_OS_WIN
 			Info.data = buf.ToBlob();
 			Error = m_pClient->Send(Info);
-		} else {
+		} 
+		else {
 			Error = Error_NetBroken;
 			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S3_ANSACMFLOW_FAILED, "s3 send ANSACMFLOW error.");
 		}
 		return Error == Error_Succeed ? 1 : 0;
-	} else if (event->iEvt == USER_EVT_CHAN_OFF) {
+	} 
+	else if (event->iEvt == USER_EVT_CHAN_OFF) {
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
+		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S3_CHAN_OFF, "s3 chan off.");
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL)
 	{

Other/libfacecapture/libfacecapture.cpp

@@ -1012,13 +1012,10 @@ private:
 	//人脸检测，对上次检测到的人脸区域进行搜索
 	bool FaceDetect(CameraEnum eCamera, CvRect rect)
 	{
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d Enter FaceDetect", __FUNCTION__, __LINE__);
-
 		if (!GetImage(eCamera)){
 			return false;
 		}
 	
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		CvMemStorage*pFaceStorage = NULL;
 		if (eCamera == EnvironCamera){
 			pFaceStorage = m_pFaceStorage;
@@ -1026,42 +1023,25 @@ private:
 		else{
 			pFaceStorage = m_pFaceStorage;
 		}
-			
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 
 		CCustomerInfo UserFaceTemp;
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		CCustomerInfo astFaceTemp;
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		memset(&astFaceTemp,0,sizeof(CCustomerInfo));
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		memset(&UserFaceTemp,0,sizeof(CCustomerInfo));
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		CvRect* pFaceRect = NULL;		//人脸矩形
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		cvResetImageROI(m_pProcessImg);
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		cvSetImageROI(m_pProcessImg,rect);
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		//内存初始化
 		if (pFaceStorage){
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			pFaceStorage = cvCreateMemStorage(0);
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			cvClearMemStorage(pFaceStorage);
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		}
 		else{
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			pFaceStorage = cvCreateMemStorage(0);
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 		}
 
-		m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
-
 		//人脸搜索
 		if (m_pFaceCascade == NULL){
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -1069,9 +1049,7 @@ private:
 		pfaceSeq = cvHaarDetectObjects(m_pProcessImg,m_pFaceCascade,pFaceStorage,1.2,3,CV_HAAR_DO_CANNY_PRUNING,cvSize(size,size));
 		if (!pfaceSeq || !pfaceSeq->total)
 		{
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			cvReleaseMemStorage(&pfaceSeq->storage);
-			m_pHostApi->Debug(FACECAP_DEBUG, "%s:%d FaceDetect", __FUNCTION__, __LINE__);
 			pfaceSeq = NULL;
 			return false;
 		}
@@ -1839,7 +1817,7 @@ private:
 						bRst = FaceSearch(size);
 						if (!bRst){
 							SetUpperbodyToCenter();
-							iwaittime = m_stFaceConfig.nSleepMiddle;
+							iwaittime = m_stFaceConfig.nSleepLong;
 						}
 						else{
 							if (m_eMonitorState <= SomebodyFar){