Z991239-4157 #comment mod_interactivecontrol实体启动优化

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -69,88 +69,20 @@ void CITCtrlEntity::OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<IT
 void CITCtrlEntity::OnStarted() 
 {
 	m_pChannelClient = new ChannelClient(this);
-	ErrorCodeEnum Error = m_pChannelClient->Connect();
-	if (Error != Error_Succeed) {
-		m_pChannelClient->SafeDelete();
-		m_pChannelClient = NULL;
-		return;
-	}
-	ChannelService_BeginRecv_Sub Sub;
-	Sub.type = ACM_TYPE_IM;
-	Error = m_pChannelClient->BeginRecv(Sub);
-	if (Error != Error_Succeed) {
-		m_pChannelClient->GetFunction()->CloseSession();
-		m_pChannelClient = NULL;
-	}
-
-	Sub.type = ACM_TYPE_FLW;
-	Error = m_pChannelClient->BeginRecv(Sub);
-	if (Error != Error_Succeed) {
-		m_pChannelClient->GetFunction()->CloseSession();
-		m_pChannelClient = NULL;
-	}
-
-	Sub.type = ACM_TYPE_DEVICE;
-	Error = m_pChannelClient->BeginRecv(Sub);
-	if (Error != Error_Succeed) {
-		m_pChannelClient->GetFunction()->CloseSession();
-		m_pChannelClient = NULL;
-	}
-
-	Sub.type = ACM_TYPE_H5_SYNC;
-	Error = m_pChannelClient->BeginRecv(Sub);
-	if (Error != Error_Succeed){
-		m_pChannelClient->GetFunction()->CloseSession();
-		m_pChannelClient = NULL;
-	}
-
-	ChannelService_BeginState_Sub Sub1;
-	Error = m_pChannelClient->BeginState(Sub1);
-	if (Error != Error_Succeed) {
-		m_pChannelClient->GetFunction()->CloseSession();
-		m_pChannelClient = NULL;
+	if (Error_Succeed == ConnectAssistChannel()) {
+		m_bConnectAssist = TRUE;
 	}
 
-	m_pPlayClient = new LocalPlayClient(this);
-	Error = m_pPlayClient->Connect();
-	if (Error != Error_Succeed){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Fail to connect to LocalPlayClient, with error = %d!", Error);
-		m_pPlayClient->SafeDelete();
-		m_pPlayClient = NULL;
-		return;
+	if (Error_Succeed == ConnectToLocalPlay(false)) {
+		m_bConnectPlayer = TRUE;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Succeed to connect to LocalPlayClient!");
-
-	m_pSalesRecordClient = new SalesRecordClient(this);
-	Error = m_pSalesRecordClient->Connect();
-	if (Error != Error_Succeed) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Fail to connect to SalesRecordClient, with error = %d!", Error);
-		m_pSalesRecordClient->SafeDelete();
-		m_pSalesRecordClient = NULL;
-		return;
+	else {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ConnectToLocalPlayer Failed!");
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Succeed to connect to SalesRecordClient!");
-}
-
 
-BOOL CITCtrlEntity::IsSurpportContinuRecordType()
-{
-	BOOL bRet = FALSE;
-	if (ePadtype == m_eDeviceType || eDesk2SType == m_eDeviceType || eDesk1SType == m_eDeviceType || eDesk2SIntegratedType == m_eDeviceType) {
-		bRet = TRUE;
+	if (Error_Succeed != ConnectToSalesRecord(false)) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ConnectToSalesRecord Failed!");
 	}
-
-	return bRet;
-}
-
-BOOL CITCtrlEntity::IsMayUseEwsCameraDevice()
-{
-	BOOL bRet = FALSE;
-	if (ePadtype == m_eDeviceType || eDesk2SType == m_eDeviceType || eMobilePadType == m_eDeviceType) {
-		bRet = TRUE;
-	}
-
-	return bRet;
 }
 
 DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
@@ -276,13 +208,7 @@ ErrorCodeEnum CITCtrlEntity::__OnClose(ErrorCodeEnum preOperationError)
 	CSmartPointer<IEntityFunction> pFunc = GetFunction();
 	pFunc->UnregistSysVarEvent("UIState");
 	pFunc->UnregistSysVarEvent("CustomerHandle");
-	if (eMobilePadType == m_eDeviceType|| IsSurpportContinuRecordType())
-	{
-		pFunc->UnregistSysVarEvent("CameraState"); 
-		if (IsMayUseEwsCameraDevice()){
-			pFunc->UnregistSysVarEvent("EwsCameraState"); 
-		}
-	}
+
 	pFunc->UnregistSysVarEvent(SYSVAR_CALLTYPE);
 	m_pChannelClient->GetFunction()->CloseSession();
 	m_pChannelClient = NULL;
@@ -450,16 +376,6 @@ void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const
 		{
 			if (pszValue[0] != 'N' && pszValue[0] != 'I')
 			{
-				// PAD/低柜双屏以内置报错方式报告广角摄像头故障 add by ly@2018/10(edit by ly@2019/04/25)
-				if (IsMayUseEwsCameraDevice())
-				{
-					CameraFaultOccurred evt;
-					evt.state = pszValue[0];
-					evt.camname = CSimpleStringA2W(strlen(pszValue)<=1?"":pszValue+1); // add camera name by ly at 20161018
-					SpSendBroadcast(GetFunction(), SP_MSG_OF(CameraFaultOccurred), SP_MSG_SIG_OF(CameraFaultOccurred), evt);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[dbg] CameraFaultOccurred broadcast sent!");
-				}
-
 				WideAngleCameraFault evt;
 				evt.state = pszValue[0];
 				evt.camname = CSimpleStringA2W(strlen(pszValue)<=1?"":pszValue+1); // add camera name by ly at 20161213
@@ -1734,12 +1650,6 @@ void UIServiceSession::Handle_StopRecordVideo(SpReqAnsContext<UIService_StopReco
 	}
 
 	ctx->Answer(Error);
-
-	DeviceTypeEnum deviceType = m_pEntity->m_eDeviceType;
-	if (m_pEntity->IsMayUseEwsCameraDevice()) {
-		::Sleep(1000);
-		m_pEntity->StopEwsCamera();
-	}
 }
 
 void UIServiceSession::Handle_ShowVideo(SpReqAnsContext<UIService_ShowVideo_Req, UIService_ShowVideo_Ans>::Pointer ctx)

Module/mod_interactivecontrol/mod_interactivecontrol.h

@@ -85,10 +85,6 @@ public:
 
 	virtual void OnStarted();
 
-	BOOL IsSurpportContinuRecordType();
-
-	BOOL IsMayUseEwsCameraDevice();
-
 	DeviceTypeEnum RvcGetDeviceType();
 
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError);

Module/mod_sipphone/Event.h

@@ -132,8 +132,6 @@
 #define EVENT_MOD_CONNECT_STOP_RECORD_BROADCAST			0x10303060	// 结束双录语音播报
 #define EVENT_MOD_CONNECT_BEGAIN_RECORD_CALL			0x10303061	// 开始双录呼叫
 
-#define LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE			0x50500001  //协助通道重启
-
 
 #define LOG_EVT_ENTER_ACM_FLOW		0x30500001          //进入坐席控制流程(initiactivetransfer发送)
 #define LOG_EVT_EXIT_ACM_FLOW		0x30500002          //进入坐席控制流程(initiactivetransfer发送)

Module/mod_snapshot/mod_snapshot.cpp

@@ -21,9 +21,6 @@ using namespace AssistantChannel;
 #include "highgui.h"
 
 
-#define LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE		0x50500001  //协助通道重启
-
-
 #ifdef RVC_OS_WIN
 #define ENV_CAP_TIMEOUT 15
 #define OPT_CAP_TIMEOUT 10