挂机bug修改，放音收号功能优化。

CTI/TaskAgentHungUp.cpp

@@ -33,9 +33,11 @@ BOOL CTaskAgentHungUp::DoTask()
 	m_pCurrLine->opType() = PDU_CMD_AGENT_HANGUP;
 
 	CCallSession* pSession = CSessionHolder::GetInstance().findSession(m_pCurrLine->callId());
-	if (pSession->lineCount() == 2) {//2018.5.25.安图要求分机挂时，挂外线。
-		CLogicLine* pAssoLine = m_pCurrLine->assoLine(); 
-		if (pAssoLine != NULL){
+	if (pSession != NULL && pSession->lineCount() == 2)
+	{   //2018.5.25.安图要求分机挂时，挂外线。
+		CLogicLine* pAssoLine = m_pCurrLine->assoLine();
+		if (pAssoLine != NULL)
+		{
 			CCtiCore::GetInstance().getDevLink().exec((long)this, LINE_OP_HANG_UP, pAssoLine->lineId(), NULL);
 		}
 	}

FsLink/EslGateway.cpp

@@ -418,13 +418,13 @@ void CEslGateway::__onEslEvtHold( esl_event_t* pEvent, EVENT_HOLD_TYPE EvtType )
 bool CEslGateway::start( void )
 {
 	//m logger
-	LOGGER(LOG_LEVEL_WARNING, _T("{EslGateway}: 处理客户端连接, ip = %s,port=%d,pwd=%s"), CConfig::fsAddr(), CConfig::fsPort(), CConfig::fsPwd());
+	LOGGER(LOG_LEVEL_NORMAL, _T("{EslGateway}: 处理客户端连接, ip = %s,port=%d,pwd=%s"), CConfig::fsAddr(), CConfig::fsPort(), CConfig::fsPwd());
 
 	esl_connect(&m_EslHdl4Listen, CConfig::fsAddr(), CConfig::fsPort(), NULL, CConfig::fsPwd());
 	if(!m_EslHdl4Listen.connected)
 		return false;
 
-	LOGGER(LOG_LEVEL_WARNING, _T("{EslGateway}: 处理客户端连接m_EslHdl4Listen OK"));
+	LOGGER(LOG_LEVEL_NORMAL, _T("{EslGateway}: 处理客户端连接m_EslHdl4Listen OK"));
 
 	esl_events(&m_EslHdl4Listen, ESL_EVENT_TYPE_PLAIN, 
 		_T("BACKGROUND_JOB CHANNEL_CREATE CHANNEL_PROGRESS CHANNEL_PROGRESS_MEDIA CHANNEL_ANSWER CHANNEL_HANGUP_COMPLETE CHANNEL_HOLD CHANNEL_UNHOLD DTMF CUSTOM sofia::register sofia::unregister"));

FsLink/OpPlayAndDtmf.cpp

@@ -7,6 +7,8 @@
 
 COpPlayAndDtmf::COpPlayAndDtmf(COperationReactor* pParent, LONG Instance) : COperation(pParent, Instance),m_Dtmf("")
 {
+	m_bExecuteEnd = FALSE;
+	m_bDtmfEnd = FALSE;
 	ZeroMemory(&m_PlayContent, sizeof(m_PlayContent));
 }
 
@@ -51,6 +53,9 @@ bool COpPlayAndDtmf::start( LineOpParam* pParam )
 	if(m_pHostChan->state() != CHAN_LOGIC_STATE_STANDBY)
 		return false;
 
+	m_bExecuteEnd = FALSE;
+	m_bDtmfEnd = FALSE;
+
 	// 初始化放音内容
 	ZeroMemory(&m_PlayContent, sizeof(m_PlayContent));
 	m_PlayContent.nModel = (PlayVoiceMode)pParam->nParam1;
@@ -130,6 +135,16 @@ void COpPlayAndDtmf::onHostChanDtmf( LPCTSTR Dtmf )
 {
 	ASSERT(Dtmf != NULL);
 	m_Dtmf += Dtmf;
+
+	if (m_PlayContent.nDtmfCount <= m_Dtmf.GetLength())
+	{
+		m_bDtmfEnd = TRUE; // 收号完成
+	}
+
+	if (m_bExecuteEnd == TRUE && m_bDtmfEnd == TRUE) // 如果 onChanAppExecuted 先执行完成
+	{
+		_end(true);
+	}
 }
 
 /*****************************************************************
@@ -155,6 +170,20 @@ void COpPlayAndDtmf::onChanAppExecuted( CVirtualChan* pHostChan, PAPP_EXEC_NOTIF
 	ASSERT(pNotify != NULL);
 	if (pNotify == NULL)
 		return;
-	if(lstrcmp(pNotify->App, ESL_APP_PLAY_DTMF) == 0 || lstrcmp(pNotify->App, ESL_APP_PLAY) == 0)
-		_end(true);
+	if (lstrcmp(pNotify->App, ESL_APP_PLAY_DTMF) == 0 || lstrcmp(pNotify->App, ESL_APP_PLAY) == 0)
+	{
+		m_bExecuteEnd = TRUE;
+		LOGGER(LOG_LEVEL_NORMAL, _T("{COpPlayAndDtmf}: 通道任务执行结束事件处理 主通道号: %d"), m_pHostChan->no());
+		if (m_PlayContent.nModel == PVM_PLAY_WAIT_DIGIT || m_PlayContent.nModel == PVM_WAIT_DIGIT)
+		{
+			if (m_bDtmfEnd == TRUE)
+			{
+				_end(true);
+			}
+		}
+		else
+		{
+			_end(true);
+		}
+	}
 }

FsLink/OpPlayAndDtmf.h

@@ -40,6 +40,8 @@ protected:
 	virtual void _end(bool IsSucceed);			// 操作完成(注：此操作之后只能调用 return 语句)
 
 private:
+	BOOL m_bExecuteEnd;
+	BOOL m_bDtmfEnd;
 	PlayVoiceContent m_PlayContent;
 	CString m_Dtmf;
 };