会议时添加主叫号码

MidWare_WinStandard1.0-zmd/ACD/VideoOffice.cpp

@@ -49,6 +49,7 @@ bool CVideoOffice::findVideoExten(uint32_t & a_VideoExtId, std::string & a_Video
 			a_VideoExtId = it->second->id();
 			a_VideoExtPwd = it->second->pwd();
 			std::cout << "{CVideoOffice}" << a_VideoExtId << "-" << a_VideoExtPwd << std::endl;
+			ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 获取视频分机号[%lu]密码[%s]"), a_VideoExtId, a_VideoExtPwd.c_str());
 			return true;
 		}
 		++it;
@@ -64,6 +65,19 @@ bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId)
 	if (it != m_VideoExtens.end())
 	{
 		it->second->isUsed() = false;
+		ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 释放视频分机号[%lu]状态[%s]"), a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
+	}
+	
+	{
+		CString str,str1;
+		auto iter = m_VideoExtens.begin();
+		while (iter != m_VideoExtens.end())
+		{
+			str1.Format("分机[%lu]状态[%s]\n",iter->second->id(),iter->second->isUsed()?"已被用":"可用");
+			str += str1;
+			++iter;
+		}
+		ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 视频分机信息\n[%s]"),str.GetBuffer(0));
 	}
 	return true;
 }

MidWare_WinStandard1.0-zmd/CTI/TaskAgentThreeTalk.cpp

@@ -30,6 +30,9 @@ BOOL CTaskAgentThreeTalk::DoTask()
 
     m_pCurrLine->opType() = PDU_CMD_AGENT_THREETALK;
 
+	if (m_CurrCmd.GetDataString(4).IsEmpty() || m_CurrCmd.GetDataString(4) == "")
+		m_CurrCmd.SetDataString(4, m_pCurrLine->callerNum());
+
     // 向底层设备发送三方通话
     LineOpParam pLineOpParam;
     memset( &pLineOpParam, 0, sizeof( pLineOpParam ) );

MidWare_WinStandard1.0-zmd/CTI/ViewResBase.cpp

@@ -101,6 +101,11 @@ bool CViewResBase::create( CDisplayWnd* pWnd, UINT PanId, UINT ListId )
 		TRACE0("创建设备资源控件失败\n");
 		return false;
 	}
+	//禁用clistctrl自动排序,中继资源视图
+	if (IDC_LIST_TRUNK == ListId)
+	{
+		ModifyStyle(LVS_SORTASCENDING | LVS_SORTDESCENDING, true);
+	}
 	SendMessage(LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES);
 
 	InsertColumn(COLUMN_RES_ID, _T("资源ID"), LVCFMT_LEFT, 130);