//2018.5.25.安图要求分机挂时，挂外线

.gitignore

@@ -3,4 +3,6 @@
 ipch/
 */Release/
 */Debug/
-.vs/
+.vs/
+*.obj
+*.exe

ACD/AgentOffice.cpp

@@ -154,7 +154,7 @@ BOOL CAgentOffice::insertAgent( UINT a_AgentID, UINT a_ExtID, LPCTSTR a_GroupID,
 	{ 
 		//2018.5.25重复请求签入
 		CAgent* t_pAgent = getAgentById(a_AgentID);
-		int t_asso_exten = t_pAgent->assoExten();;
+		int t_asso_exten = t_pAgent->assoExten();
 		if (t_asso_exten == a_ExtID) {
 			
 			//CAcdCore::GetInstance().getQueueMgr().addAgent(t_pAgent);// 座席添加到排队队列

CTI/LogicLineTrunk.cpp

@@ -28,9 +28,9 @@ void CLogicLineTrunk::onLineStatusUpdated( const EventResStatus &EvtInfo )
 	m_CallerNum = EvtInfo.szCallerNum;
 	m_CalleeNum = EvtInfo.szCalleeNum;
 
-	ILogger::getInstance().log(LOG_CLASS_DEV, LOG_LEVEL_NORMAL, _T("{LogicLineTrunk}: 线路状态, LineId = %lu，State=%d,CallId=%lu,Caller=%s,Callee=%s"), m_LineId, m_LineStatus, m_CallId, m_CallerNum, m_CalleeNum);
+	//ILogger::getInstance().log(LOG_CLASS_DEV, LOG_LEVEL_NORMAL, _T("{LogicLineTrunk}: 线路状态, LineId = %lu，State=%d,CallId=%lu,Caller=%s,Callee=%s"), m_LineId, m_LineStatus, m_CallId, m_CallerNum, m_CalleeNum);
 
-	// 统计线路状态变化
+	//统计线路状态变化
 	_reportLineStatus();
 
 	// 通知会话状态变化，保持会话(m_nHoldCallId)不再通知

CTI/Task.cpp

@@ -181,7 +181,7 @@ void CTask::_ProcCmdReturn(BOOL Result, bool FreeRes/* = false*/ )
 		return;
 
 	// ÏÔʾÈÕÖ¾
-	ILogger::getInstance().log(LOG_CLASS_SOCKET, Result ? LOG_LEVEL_NORMAL : LOG_LEVEL_WARNING, _T("CTI->%s, CMD = return[%d], Line = %d, IsSuccess = %d"),
+	ILogger::getInstance().log(LOG_CLASS_SOCKET, Result ? LOG_LEVEL_NORMAL : LOG_LEVEL_WARNING, _T("CTI->%s,TaskCMD = return[%d], Line = %d, IsSuccess = %d"),
 				m_CurrCmd.GetLocalDevType() == PDU_DEV_TYPE_ACD ? _T("ACD") : _T("IVR"),
 				m_CurrCmd.GetCmdType(),
 				m_pCurrLine == NULL ? 0 : m_pCurrLine->lineId(),

CTI/TaskAgentHungUp.cpp

@@ -3,6 +3,8 @@
 #include "LineHolder.h"
 #include "LogicLine.h"
 #include "CtiCore.h"
+#include "SessionHolder.h"
+#include "CallSession.h"
 
 CTaskAgentHungUp::CTaskAgentHungUp(CPduEntity &PduEntity) : CTask(PduEntity)
 {
@@ -30,6 +32,13 @@ 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){
+			CCtiCore::GetInstance().getDevLink().exec((long)this, LINE_OP_HANG_UP, pAssoLine->lineId(), NULL);
+		}
+	}
 	// 向底层设备发送挂机命令
 	return CCtiCore::GetInstance().getDevLink().exec((long)this, LINE_OP_HANG_UP, m_pCurrLine->lineId(), NULL);
 }