Z991239-5321 #comment 增加麦克风和扬声器设备丢失告警

Module/include/EventCode.h

@@ -680,30 +680,9 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define LOG_ERR_HEALTH_FAILED 0x50180001
 #define LOG_ERR_HEALTH_START_ENTITY_FAILED 0x50180002
 
-#define ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG		0x20880021  //环境摄像头故障，视频队列中无视频信号,级别3
-#define ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG		0x20880022  //操作摄像头故障，视频队列中无视频信号,级别3
-#define ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN		0x20880042  //环境摄像头打开失败,级别3
-#define ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN		0x20880043  //操作摄像头打开失败,级别3
-#define ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL   0x20880046  //环境摄像头初始化失败,级别3
-#define ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL   0x20880047  //操作摄像头初始化失败,级别3
-
-#define ERROR_MOD_MEDIACONTROLLER_CONFIG_ALLERROR   0x20880050  //配置的摄像头都故障
-
-#define ERROR_MOD_SURVEILLANCERECORDER_EWSCAMERA_BUG     0x21A80021  //外部广角摄像头故障，视频队列中无视频信号,级别3
-#define ERROR_MOD_SURVEILLANCERECORDER_EWSCAM_OPEN		 0x21A80043  //外部广角摄像头打开失败,级别3
-#define ERROR_MOD_SURVEILLANCERECORDER_EWSCAM_INITFAIL   0x21A80046  //外部广角摄像头初始化失败,级别3
-
-
 #define EVENT_MOD_RELEASESIP_TIMEOUT  0x30470001  //SIP释放超时，重启SIPPHONE模块 
 
 
-
-
-
-#define  EVENT_MOD_FACE_ENVCAM_ERROR    0x31280010 //环境摄像机故障
-#define  EVENT_MOD_FACE_OPECAM_ERROR    0x31280011 //操作摄像机故障
-#define  EVENT_MOD_FACE_OPENCV_ERROR    0x31280004
-
 #define	LOG_EVT_IEBROWSER_MOUSE_OP	0x40100001   //鼠标操作
 #define	LOG_EVT_IEBROWSER_AGENT_INPUT_WRITING	0x40100002   //Agent Input State Writing
 #define	LOG_EVT_IEBROWSER_AGENT_INPUT_IDLE	0x40100003   //Agent Input State Idle

Module/mod_mediacontroller/Event.h

@@ -7,7 +7,6 @@
 #define MOD_EVENT_MEDIACONTROLLER_FINISHED_CAPTURE_ENVOPT	(MOD_EVENT_MEDIACONTROLLER_BASE +3)
 
 
-
 #define ERROR_MOD_MEDIACONTROLLER_HANDFREE_USEFAIL			0x20880004  //免提使用中失败,级别3	
 #define ERROR_MOD_MEDIACONTROLLER_HANDFREE_NOSIGNAL			0x20880005  //免提没有信号,级别3	
 #define ERROR_MOD_MEDIACONTROLLER_HANDFREE_NOISEBIG			0x20880006  //免提噪声过大,级别2	
@@ -26,9 +25,19 @@
 #define ERROR_MOD_MEDIACONTROLLER_PICKUP_CLOSEFAIL			0x20880017  //禁止话筒失败,级别2
 #define ERROR_MOD_MEDIACONTROLLER_PICKUP_OPENFAIL			0x20880018  //打开话筒失败,级别2
 
+#define ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG				0x20880021  //环境摄像头故障，视频队列中无视频信号,级别3
+#define ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG				0x20880022  //操作摄像头故障，视频队列中无视频信号,级别3
 #define ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_VAGUE			0x20880023  //环境摄像头模糊,级别2
 #define ERROR_MOD_MEDIACONTROLLER_OPECAMERAL_VAGUE			0x20880024  //操作摄像头模糊,级别2
 
+#define ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN				0x20880042  //环境摄像头打开失败,级别3
+#define ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN				0x20880043  //操作摄像头打开失败,级别3
+#define ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL			0x20880046  //环境摄像头初始化失败,级别3
+#define ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL			0x20880047  //操作摄像头初始化失败,级别3
+
+#define ERROR_MOD_MEDIACONTROLLER_CONFIG_ALLERROR			0x20880050  //配置的摄像头都故障
+
+
 #define ERROR_MOD_MEDIACONTROLLER_RECORD_DISKFULL			0x20880031  //录像磁盘满,级别2
 #define ERROR_MOD_MEDIACONTROLLER_RECORD_WRITEFAIL			0x20880032  //录像写入失败,级别3
 

Module/mod_recorder/mod_recorder.cpp

@@ -10,9 +10,9 @@
 #include "y2k_time.h"
 #include <string.h>
 
-#include "mod_customeraware/Event.h"
 #include "mod_facetracking/sysvar.h"
 #include "mod_interactivecontrol/Event.h"
+#include "mod_mediacontroller/Event.h"
 
 using namespace Recorder;
 
@@ -119,6 +119,8 @@ void RecordServiceSession::Handle_StartTransactionRecord(SpReqAnsContext<Recorde
 
 	m_pEntity->StartRecord(CSimpleStringA::Format("%s%s", RVC_TRANSATCION_RECORD_SUFFIX, ctx->Req.VideoName.GetData()).GetData());
 
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start video record %s.", ctx->Req.VideoName.GetData());
+
 	ctx->Answer(Error_Succeed);
 }
 
@@ -129,6 +131,8 @@ void RecordServiceSession::Handle_StopTransactionRecord(SpReqAnsContext<Recorder
 	
 	m_pEntity->StopRecord();
 
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("stop video record %s.", ctx->Req.VideoName.GetData());
+
 	ctx->Answer(Error_Succeed);
 }
 
@@ -162,13 +166,15 @@ ErrorCodeEnum CRecorderEntity::__OnStart(ErrorCodeEnum preOperationError)
 	InitRecorder();
 		
 	int i = 0;
-	m_arrListener.Init(5);
+	m_arrListener.Init(7);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, EVENT_MOD_PAUSE_RECORD, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, EVENT_MOD_CONTINUE_RECORD, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_RECORDER_SECTION_FINISHED, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_RECORDER_WHOLE_FINISHED, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_START_BUSINESSRECORD_FAILED, NULL, false);
-	
+	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_MEDIACONTROLLER_CAMERA_STARTED, NULL, false);
+	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_MEDIACONTROLLER_CAMERA_STOPPED, NULL, false);
+
 	GetFunction()->RegistSysVarEvent(SYSVAR_ACTIVETRACKINGCAMERA,this);
 	GetFunction()->RegistSysVarEvent(SYSVAR_CAMERASTATE,this);
 	CSimpleStringA strValue;
@@ -540,6 +546,14 @@ void CRecorderEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,
 		PostVideoRecordInfos();
 		break;
 
+	case LOG_EVT_MEDIACONTROLLER_CAMERA_STARTED:
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_MEDIACONTROLLER_CAMERA_STARTED event");
+		break;
+
+	case LOG_EVT_MEDIACONTROLLER_CAMERA_STOPPED:
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_MEDIACONTROLLER_CAMERA_STOPPED event");
+		break;
+
 	default:
 		break;
 	}

Module/mod_sipphone/Event.h

@@ -147,6 +147,9 @@
 #define LOG_EVT_SIPPHONE_RETART_REQUEST								0x30190916	//重启机器告警
 #define LOG_EVT_SIPPHONE_AUDIOMGR_INITIAL_FAILED					0x30190917	//audiomgr初始化失败
 
+#define ERROR_MOD_SIP_AUDIO_IN_COUNT								0x30190918  //audio in device count error,级别2
+#define ERROR_MOD_SIP_AUDIO_OUT_COUNT								0x30190919  //audio out device count error,级别2
+
 #define EVENT_MOD_SIP_ENTITY_STARTED								0x301A0001	//sipphone entity start
 #define EVENT_MOD_SIP_INVITE_SEND									0x301A0002	//sip invite send
 #define EVENT_MOD_SIP_PROCESS_MSG									0x301A0003	//sip process messsage

Module/mod_sipphone/mod_sipphone.h

@@ -57,6 +57,14 @@ using namespace AssistantChannel;
 #define RVC_INTERVAL_TIME 3*60
 #endif // ! RVC_INTERVAL_TIME
 
+#ifndef RVC_AUDIO_IN_DEVICE_COUNT
+#define RVC_AUDIO_IN_DEVICE_COUNT 2
+#endif // !RVC_AUDIO_IN_DEVICE_COUNT
+
+#ifndef RVC_AUDIO_OUT_DEVICE_COUNT
+#define RVC_AUDIO_OUT_DEVICE_COUNT 2
+#endif // !RVC_AUDIO_OUT_DEVICE_COUNT
+
 class CSIPEntity;
 class CSIPPhoneSession;
 
@@ -363,11 +371,7 @@ public:
 	void* m_pKeeperIn[2];
 	void* m_pKeeperOut[2];
 	eVideoRenderType m_eVideoRenderType;
-	CSimpleStringA m_strStunServer;
-	CSimpleStringA m_strStunPort;
-	int m_iStunTimeOut;
-	BOOL m_bStunFlag;
-	BOOL m_bAudioMgrInited;
+	bool m_bAudioMgrInited;
 	int m_AudioStopType;
 	int m_iCapType;
 	CSimpleStringA m_strHandfreeIn;
@@ -405,7 +409,7 @@ private:
 	CAutoArray<CUUID> m_arrListener;
 	ChannelSipphoneClient*m_pSipphoneChannel;
 	HealthManagerService_ClientBase* m_pHMClient;
-	BOOL m_bConnectedAssist;
+	bool m_bConnectedAssist;
 };
 
 

Module/mod_sipphone/unix/mod_sipphone.cpp

@@ -226,7 +226,7 @@ CSIPEntity::CSIPEntity() : m_pCurrentSession(NULL), m_state(INIT),m_iPickupPhone
 #endif
 	m_SipErrorCode = Error_Succeed;
 	memset((void*)&m_stVideoParam,0,sizeof(stVideoParam));
-	m_bConnectedAssist = FALSE;
+	m_bConnectedAssist = false;
 	m_ilocalvideo_freshtime = RVC_VIDEO_FRESH_TIME;
 	m_iremotevideo_freshtime = RVC_VIDEO_FRESH_TIME;
 	m_render = NULL;
@@ -244,13 +244,13 @@ void CSIPEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const
 		{
 			Sleep(810);
 			if (m_pSipphoneChannel != NULL){
-				m_bConnectedAssist = FALSE;
+				m_bConnectedAssist = false;
 				m_pSipphoneChannel->GetFunction()->CloseSession();
 				m_pSipphoneChannel = NULL;
 			}
 
 			if (Error_Succeed == ConnectAssistChannel()) {
-				m_bConnectedAssist = TRUE;
+				m_bConnectedAssist = true;
 			}
 			else {
 				GetFunction()->SetTimer(2, this, 3200);
@@ -554,7 +554,7 @@ void CSIPEntity::OnStarted()
 
 	m_pSipphoneChannel = new ChannelSipphoneClient(this);
 	if (Error_Succeed == ConnectAssistChannel()){
-		m_bConnectedAssist = TRUE;
+		m_bConnectedAssist = true;
 	}
 	else {
 		GetFunction()->SetTimer(2, this, 3200);
@@ -1153,18 +1153,34 @@ ErrorCodeEnum CSIPEntity::RvcGetAudioDeviceInfo()
 		int icountmic = m_pAudioMgr->audio_get_device_count(true);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio input devices(%d):", icountmic);
 		int i = 0;
+		CSimpleStringA strJsonIn("");
 		for (; i < icountmic; i++) {
 			char strname[MAX_PATH] = { 0 };
 			m_pAudioMgr->audio_get_device_name(strname, MAX_PATH, true, i);
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+			strJsonIn += CSimpleStringA::Format("\"%d\":\"%s\",", i, strname);
 		}
+		if (strJsonIn.GetLength() > 0) {
+			strJsonIn[strJsonIn.GetLength() - 1] = '\0';
+		}
+		CSimpleStringA strJsonInData = CSimpleStringA::Format("audio in devices [{%s}]", strJsonIn.GetData());
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_SIPPHONE_GET_AUDIO_IN_INFOS, strJsonInData.GetData());
+
+		CSimpleStringA strJsonOut("");
 		int icountspeaker = m_pAudioMgr->audio_get_device_count(false);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio output devices(%d):", icountspeaker);
 		for (i = 0; i < icountspeaker; i++) {
 			char strname[MAX_PATH] = { 0 };
 			m_pAudioMgr->audio_get_device_name(strname, MAX_PATH, false, i);
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+			strJsonOut += CSimpleStringA::Format("\"%d\":\"%s\",", i, strname);
 		}
+		if (strJsonOut.GetLength() > 0) {
+			strJsonOut[strJsonOut.GetLength() - 1] = '\0';
+		}
+		CSimpleStringA strJsonOutData = CSimpleStringA::Format("audio out devices [{%s}]", strJsonOut.GetData());
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_SIPPHONE_GET_AUDIO_OUT_INFOS, strJsonOutData.GetData());
+
 		Error = Error_Succeed;
 	}
 	return Error;
@@ -1642,13 +1658,13 @@ void CSIPEntity::OnTimeout(DWORD dwTimerID)
 	}
 	else if (2 == dwTimerID)
 	{
-		if (FALSE == m_bConnectedAssist) {
+		if (!m_bConnectedAssist) {
 			if (Error_Succeed == ConnectAssistChannel()) {
-				m_bConnectedAssist = TRUE;
+				m_bConnectedAssist = true;
 			}
 		}
 
-		if (TRUE == m_bConnectedAssist){
+		if (m_bConnectedAssist){
 			GetFunction()->KillTimer(2);
 		}
 	}

Module/mod_sipphone/win/audio_session.cpp

@@ -894,7 +894,7 @@ int audio_lib_init()
 		rc = audio_get_dev_count(&icnt, &ocnt);
 		if (rc == 0) {
 			int i;
-			CSimpleStringA strJsonIn;
+			CSimpleStringA strJsonIn("");
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio input devices(%d):", icnt);
 			for (i = 0; i < icnt; ++i) {
 				CSimpleStringA str = audio_get_dev_name(true, i);
@@ -908,7 +908,7 @@ int audio_lib_init()
 			CSimpleStringA strJsonInData = CSimpleStringA::Format("audio in devices [{%s}]", strJsonIn.GetData());
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_SIPPHONE_GET_AUDIO_IN_INFOS, strJsonInData.GetData());
 
-			CSimpleStringA strJsonOut;
+			CSimpleStringA strJsonOut("");
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio output devices(%d):", ocnt);
 			for (i = 0; i < ocnt; ++i) {
 				CSimpleStringA str = audio_get_dev_name(false, i);

Module/mod_sipphone/win/mod_sipphone.cpp

@@ -235,20 +235,16 @@ CSIPEntity::CSIPEntity() : m_pCurrentSession(NULL), m_state(INIT),m_iPickupPhone
 	m_SipErrorCode = Error_Succeed;
 	m_eVideoRenderType = eGDI;
 	memset((void*)&m_stVideoParam,0,sizeof(stVideoParam));
-	m_strStunServer = RVC_DEFAULT_STUNSERVER;
-	m_strStunPort = RVC_DEFAULT_STUNPORT;
-	m_iStunTimeOut = RVC_STUN_TIMEOUT;
-	m_bStunFlag = FALSE;
-	m_bAudioMgrInited = FALSE;
+	m_bAudioMgrInited = false;
 	m_pAudioMgr = NULL;
 	m_AudioStopType = 1;
 	m_iCapType = 1;
 	m_pSipphoneChannel = NULL;
-	m_bConnectedAssist = FALSE;
+	m_bConnectedAssist = false;
 	m_strStartTime = RVC_START_TIME;
 	m_strEndTime = RVC_END_TIME;
 	m_itervalTime = RVC_INTERVAL_TIME;
-	m_bStopAutoRestart = FALSE;
+	m_bStopAutoRestart = false;
 	m_iAudioDspUseCenter = 0;
 }
 
@@ -263,14 +259,14 @@ void CSIPEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const
 		{
 			Sleep(810);
 			if (m_pSipphoneChannel != NULL){
-				m_bConnectedAssist = FALSE;
+				m_bConnectedAssist = false;
 				m_pSipphoneChannel->GetFunction()->CloseSession();
 				m_pSipphoneChannel->SafeDelete();
 				m_pSipphoneChannel = NULL;
 			}
 
 			if (Error_Succeed == ConnectAssistChannel()) {
-				m_bConnectedAssist = TRUE;
+				m_bConnectedAssist = true;
 			}
 			else {
 				GetFunction()->SetTimer(2, this, 3200);
@@ -566,8 +562,6 @@ void CSIPEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITr
 
 void CSIPEntity::OnStarted() 
 { 
-    LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
-
 	ErrorCodeEnum Error = Error_Succeed;
 	m_pHMClient = new HealthManagerService_ClientBase(this);
 	Error = m_pHMClient->Connect();
@@ -579,7 +573,7 @@ void CSIPEntity::OnStarted()
 
 	m_pSipphoneChannel = new ChannelSipphoneClient(this);
 	if (Error_Succeed == ConnectAssistChannel()){
-		m_bConnectedAssist = TRUE;
+		m_bConnectedAssist = true;
 	}
 
 	if (!m_pAudioMgr || !m_bAudioMgrInited){
@@ -618,6 +612,7 @@ void CSIPEntity::OnStarted()
 	}
 
 	LogEvent(Severity_Middle, LOG_EVT_MOD_SIPPHONE_STARTED_SUCCESS, "sipphone entity started successfully.");
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
 }
 
 
@@ -835,7 +830,7 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		t_callback.debug = &__audiomgrlog;
 		m_pAudioMgr = CreateAudioMgrObj(&t_callback);
 		if (0 == m_pAudioMgr->audio_mgr_initialize()) {
-			m_bAudioMgrInited = TRUE;
+			m_bAudioMgrInited = true;
 		}
 		else {
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SIPPHONE_AUDIOMGR_INITIAL_FAILED, "audio manager initialize failed!");
@@ -1230,19 +1225,26 @@ ErrorCodeEnum CSIPEntity::RvcGetAudioDeviceInfo()
 	ErrorCodeEnum Error = Error_Succeed;
 	if (NULL != m_pAudioMgr || !m_bAudioMgrInited) {
 		int icountmic = m_pAudioMgr->audio_get_device_count(true);
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("core audio input device(%d):", icountmic);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("core audio input device(%d):", icountmic);
 		int i = 0;
 		for (; i < icountmic; i++) {
 			char strname[MAX_PATH] = { 0 };
 			m_pAudioMgr->audio_get_device_name(strname, MAX_PATH, true, i);
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+		}
+		if (icountmic < RVC_AUDIO_IN_DEVICE_COUNT) {
+			LogWarn(Severity_Middle, Error_AudioIN, ERROR_MOD_SIP_AUDIO_IN_COUNT, CSimpleString::Format("audio in device count is %d.", icountmic).GetData());
 		}
+
 		int icountspeaker = m_pAudioMgr->audio_get_device_count(false);
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("core audio output device(%d):", icountspeaker);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("core audio output device(%d):", icountspeaker);
 		for (i = 0; i < icountspeaker; i++) {
 			char strname[MAX_PATH] = { 0 };
 			m_pAudioMgr->audio_get_device_name(strname, MAX_PATH, false, i);
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, strname);
+		}
+		if (icountspeaker < RVC_AUDIO_IN_DEVICE_COUNT) {
+			LogWarn(Severity_Middle, Error_AudioOut, ERROR_MOD_SIP_AUDIO_OUT_COUNT, CSimpleString::Format("audio out device count is %d.", icountspeaker).GetData());
 		}
 		Error = Error_Succeed;
 	}
@@ -1633,13 +1635,13 @@ void CSIPEntity::OnTimeout(DWORD dwTimerID)
 	}
 	else if (2 == dwTimerID)
 	{
-		if (FALSE == m_bConnectedAssist) {
+		if (!m_bConnectedAssist) {
 			if (Error_Succeed == ConnectAssistChannel()) {
-				m_bConnectedAssist = TRUE;
+				m_bConnectedAssist = true;
 			}
 		}
 
-		if (TRUE == m_bConnectedAssist){
+		if (m_bConnectedAssist){
 			GetFunction()->KillTimer(2);
 		}
 	}