Z991239-5321 #comment 优化提挂机日志信息

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -269,10 +269,12 @@ void CCounterConnectorEntity::HandlePickUpCallEvent()
 		PickUpCallMsg evt;
 		evt.infos = "pickup call";
 		SpSendBroadcast(GetFunction(), SP_MSG_OF(PickUpCallMsg), SP_MSG_SIG_OF(PickUpCallMsg), evt);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SpSendBroadcast PickUpCallMsg to UI.");
 	}
 	else {
 		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_PICKUP_CALL));
 		m_fsm.m_bNeedQueueName = false;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Terminate pickup call.");
 	}
 }
 
@@ -287,24 +289,25 @@ void CCounterConnectorEntity::HandleGetVideoFailedEvent()
 	GetFunction()->GetSysVar("CustomerHandle", strCustomerHandle);
 	CSimpleStringA strCameraState;
 	GetFunction()->GetSysVar("CameraState", strCameraState);
-	char strmsg[MAX_PATH] = { 0 };
-	char strinfo[MAX_PATH] = { 0 };
+
+	CSimpleStringA strmsg("");
+	CSimpleStringA strinfo("");
 
 	if (pMSClient->Connect() != Error_Succeed){
-		snprintf(strmsg, MAX_PATH, "%s", "connect mediacontroller entity failed");
+		strmsg = CSimpleStringA::Format("connect mediacontroller entity failed");
 		pMSClient->SafeDelete();
 		pMSClient = NULL;
 		
 	}
 	else{
-		_snprintf(strmsg, MAX_PATH, "%s", "connect mediacontroller entity success");
+		strmsg = CSimpleStringA::Format("connect mediacontroller entity success");
 		pMSClient->GetFunction()->CloseSession();
 		pMSClient->SafeDelete();
 		pMSClient = NULL;
 	}
 
-	_snprintf(strinfo, MAX_PATH, "%s, and CustomerBeing is %s, CustomerHandle is %s, CameraState is %s.", strmsg, strCustomerBeing.GetData(), strCustomerHandle.GetData(), strCameraState.GetData());
-	LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_GET_VIDEO_FAILED_INFO, strinfo);
+	strinfo = CSimpleStringA::Format("%s, and CustomerBeing is %s, CustomerHandle is %s, CameraState is %s.", strmsg, strCustomerBeing.GetData(), strCustomerHandle.GetData(), strCameraState.GetData());
+	LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_GET_VIDEO_FAILED_INFO, strinfo.GetData());
 }
 
 
@@ -314,6 +317,7 @@ void CCounterConnectorEntity::HandlePickUpMicroPhoneEvent(int iEvent, const char
 	evt.state = iEvent;
 	evt.infos = strMsg;
 	SpSendBroadcast(GetFunction(), SP_MSG_OF(PickUpMicroPhoneEvt), SP_MSG_SIG_OF(PickUpMicroPhoneEvt), evt);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", strMsg);
 }
 
 ErrorCodeEnum CCounterConnectorEntity ::__OnClose(ErrorCodeEnum preOperationError)
@@ -350,7 +354,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 			}
 			CSimpleStringA strValue;
 			GetFunction()->GetSysVar("CallState", strValue);
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("摘机,and CallState is %s.", strValue.GetData());
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("摘机,and CallState is %s.", strValue.GetData());
 			HandlePickUpMicroPhoneEvent(1, "pick up microphone.");
 		}
 		break;
@@ -363,14 +367,14 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 			}
 			CSimpleStringA strValue;
 			GetFunction()->GetSysVar("CallState", strValue);
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("挂机,and CallState is %s.", strValue.GetData());
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("挂机,and CallState is %s.", strValue.GetData());
 			HandlePickUpMicroPhoneEvent(0, "hang up microphone.");
 		}
 		break;
 	case EVENT_MOD_CONNECT_PICKUP_CALL: // 提机呼叫
 		{
 			if (m_bHasLaunched){
-				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机呼叫");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机呼叫");
 				HandlePickUpCallEvent();
 			}
 			else{
@@ -383,7 +387,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		if (m_fsm.m_bHandFree)
 		{
 			LogEvent(Severity_Middle,EVENT_MOD_CONNECT_SLV_HANDFREECALL,"handfree call");
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("界面拨号,免提呼叫");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("界面拨号,免提呼叫");
 			if (pszMessage && strlen(pszMessage) > 0 && isdigit(pszMessage[0])) 
 			{
 				char tmp[32];
@@ -406,7 +410,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		else
 		{
 			LogEvent(Severity_Middle,EVENT_MOD_CONNECT_SLV_PICKUPCALL,"from hand free to pickup call because pickup");
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("界面拨号，话筒呼叫");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("界面拨号，话筒呼叫");
 			if (pszMessage && strlen(pszMessage) > 0 && isdigit(pszMessage[0])) 
 			{
 				char tmp[32];
@@ -428,7 +432,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		break;
 	case EVENT_MOD_CONNECT_HANDFREE_TO_PICKUP: // 免提->提机
 		{
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("免提->提机");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("免提->提机");
 			m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_TO_PICKUP));
 			if (strcmp(m_fsm.GetCurrStateName(),"HandFree")==0){
 				m_fsm.m_bAgentHandFree = false;
@@ -438,7 +442,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		break;
 	case EVENT_MOD_CONNECT_PICKUP_TO_HANDFREE: // 提机->免提
 		{
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机->免提");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机->免提");
 			m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_TO_HANDFREE));
 			if (strcmp(m_fsm.GetCurrStateName(),"Pickup")==0){
 				m_fsm.m_bAgentHandFree = true;
@@ -447,21 +451,21 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		}
 		break;
 	case EVENT_MOD_CONNECT_AGENT_HANDFREE_PICKUP: // 坐席控制免提->提机
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("免提->提机");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("免提->提机");
 		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_TO_PICKUP));
 		SendCurAudioDevice();
 		break;
 	case EVENT_MOD_CONNECT_AGENT_PICKUP_HANDFREE: // 坐席控制提机->免提
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机->免提");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机->免提");
 		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_TO_HANDFREE));
 		SendCurAudioDevice();
 		break;
 	case EVENT_MOD_CONNECT_BEGAIN_RECORD_CALL:
 		{
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("开始远程双录呼叫.");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("开始远程双录呼叫.");
 			m_fsm.m_bNeedQueueName = true;
 			m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_DOUBLE_RECORD_CALL));
-			if (TRUE == m_fsm.m_bHandFree){
+			if (m_fsm.m_bHandFree){
 				LogEvent(Severity_Middle,LOG_EVT_HANDFREE_MODE_REMOTE_CALL,"remote double call start with hand free mode.");
 			}
 			else{
@@ -470,18 +474,18 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		}
 		break;
 	case EVENT_MOD_CONNECT_STOP_RECORD_BROADCAST:
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("双录播报完结束,重置电话状态");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("双录播报完结束,重置电话状态");
 		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_STOP_RECORD_BROADCAST));
 		break;
 	case EVENT_MOD_CONNECT_HANNUP: // 挂机
 		{	
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("断开呼叫");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("断开呼叫");
 			m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_HANGUP));
 			m_fsm.m_bHangup=true;
 		}
 		break;
 	case EVENT_MOD_CONNECT_HANNUP_BY_CONNECTING: // 话筒未接通时挂机
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("话筒未接通时断开呼叫");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("话筒未接通时断开呼叫");
 		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_HANGUP));
 		//m_fsm.m_bHandFree = TRUE;
 		m_fsm.m_bHangup=true;
@@ -651,7 +655,7 @@ void CCounterConnectorEntity ::OnReceivePkt(int type, int sub_type, const char *
 			//设备切换
 			//change to handfree
 		case ACM_CHANGE_HANDFREE:
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("recv change audiodevice to handfree");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("recv change audiodevice to handfree");
 			if (!m_fsm.m_bAgentHandFree)
 			{
 				LogEvent(Severity_Middle,EVENT_MOD_CONNECT_AGENT_PICKUP_HANDFREE,"agent change audio device to handfree");
@@ -664,7 +668,7 @@ void CCounterConnectorEntity ::OnReceivePkt(int type, int sub_type, const char *
 			break;
 			//change to pickup
 		case ACM_CHANGE_PICKUP:
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("recv change audio device to pickup");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("recv change audio device to pickup");
 			if (m_fsm.m_bAgentHandFree)
 			{
 				LogEvent(Severity_Middle,EVENT_MOD_CONNECT_AGENT_HANDFREE_PICKUP,"agent change audio device to pickup");