Z991239-4157 #comment 同步leve3级别告警信息修改

Module/include/EventCode.h

@@ -605,47 +605,6 @@ ERROR_ACCESSAUTH_CONNECT_ACS}
 #define LOG_WARN_COUNTERCONNECT_BRANCHMODE_CALL						0x30461006	 //branch mode call
 /*----End--CounterConnector------------------------------*/  
 
-
-/*----InteractiveControl--modify--by--CLP--at--2020/7/20----*/
-#define LOG_EVT_UI_STARTRECORD						0x30B00001				//开始录像
-#define LOG_EVT_UI_STOPRECORD						0x30B00002				//停止录像
-#define LOG_EVT_UI_SHOWVIDEO						0x30B00003				//播放录像
-#define LOG_EVT_UI_SAVEVIDEO						0x30B00004				//确认录像
-#define LOG_EVT_UI_DELETEVIDEO						0x30B00005				//放弃录像
-#define LOG_EVT_UI_RETURNMENU						0x30B00006				//退出到主菜单
-#define LOG_EVT_UI_STARTPHOTOGRAPH					0x30B00007				//开始复杂产品合同拍照
-#define LOG_EVT_UI_STOPPHOTOGRAPH					0x30B00008				//停止复杂产品合同拍照
-#define LOG_EVT_UI_SENDOPERATESTATE					0x30B00009				//UI发送操作状态，用于业务层锁定交易页面
-#define LOG_EVT_UI_START_CONTINURECORD				0x30B0000A				//开始全程录像
-#define LOG_EVT_UI_STOP_CONTINURECORD				0x30B0000B				//停止全程录像
-#define LOG_EVT_UI_START_ECHO_CONTINURECORD			0x30B0000C				//开始回显全程录像
-#define LOG_EVT_UI_STOP_ECHO_CONTINURECORD			0x30B0000D				//停止回显全程录像
-#define LOG_EVT_UI_VIDEOAPPENDWATERMARK				0x30B0000E				//双录视频追加水印
-#define LOG_EVT_UI_STARTREMOTERECORD				0x30B0000F				//开始远程双录
-#define LOG_EVT_UI_STOPREMOTERECORD					0x30B00018				//停止远程录像
-#define LOG_EVT_UI_HIDEONLINEVIDEO					0x30B00010				//隐藏视频连线窗口
-#define LOG_EVT_UI_SHOWONLINEVIDEO					0x30B00011				//显示视频连线窗口
-#define LOG_EVT_UI_HIDELOCALVIDEO					0x30B00012				//隐藏本地视频窗口
-#define LOG_EVT_UI_SHOWLOCALVIDEO					0x30B00013				//显示本地视频窗口
-#define LOG_EVT_UI_HIDEPERSONAREA					0x30B00014				//隐藏人形框
-#define LOG_EVT_UI_SHOWPERSONAREA					0x30B00015				//显示隐藏人形框
-#define LOG_EVT_UI_STARTRECORDPREVIEW				0x30B00A01				//开始录像预览
-#define LOG_EVT_UI_STOPRECORDPREVIEW				0x30B00A02				//停止录像预览
-#define LOG_EVT_UI_STARTAFTERPREVIEWRECORD			0x30B00A03				//开始预览后录像
-#define LOG_EVT_UI_ADJUSTVIDEOECHOSIZE				0x30B00A04				//调整视频回显框大小
-#define LOG_EVT_LOCALMEDIAPLAYER_LOST				0x30B00B01				//本地媒体播放lost
-#define LOG_EVT_OPEN_ADV_FROM_LOCAL_CONFIG			0x30B00B02		     	//通过本地配置要求打开广告播放
-#define LOG_EVT_FORBIDDIEN_ADV_FROM_LOCAL_CONFIG	0x30B00B03 				//通过本地配置要求关闭广告播放
-
-#define LOG_EVT_START_REMOTERECORD_SUCCESS			0x30B10001				//启动远程双录成功
-#define LOG_EVT_START_REMOTERECORD_FAILED			0x30B10002				//启动远程双录失败
-#define LOG_EVT_STOP_REMOTERECORD_SUCCESS			0x30B10003				//停止远程录像成功
-#define LOG_EVT_STOP_REMOTERECORD_FAILED			0x30B10004				//停止远程录像失败
-
-#define LOG_EVT_CONNECT_LOCALPLAY_FAILED			0x30B20001
-#define LOG_EVT_CONNECT_SAELSRECORD_FAILED			0x30B20002
-
-/*----End--InteractiveControl------------------------------*/
 #define IDCertificate_Public_Start                  	0x20190000
 #define LOG_EVT_IDCERTIFICATE_GREEN_ON					(IDCertificate_Public_Start + 1)
 #define LOG_EVT_IDCERTIFICATE_GREEN_OFF					(IDCertificate_Public_Start + 2)

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -20,7 +20,7 @@
 
 #include "mod_interactivecontrol/InteractiveControl_client_g.h"
 #include "mod_interactivecontrol/InteractiveControl_def_g.h"
-
+#include "../mod_interactivecontrol/Event.h"
 
 #define LOG_EVT_UI_RECORDFAILED							0x31500001				//双录失败
 #define LOG_EVT_SALESRECORD_ENTITY_EXCEPTION			0x31500002				//销售双录实体异常

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -9,7 +9,7 @@
 #include "CounterConnector_msg_g.h"
 #include "../include/EventCode.h"
 #include "y2k_time.h"
-//#include "../mod_interactivecontrol/Event.h"
+#include "../mod_interactivecontrol/Event.h"
 
 using namespace CounterConnector;
 

Module/mod_interactivecontrol/CMakeLists.txt

@@ -1,6 +1,7 @@
 define_module("interactivecontrol")
 
 set(${MODULE_PREFIX}_SRCS
+	Event.h
 	mod_interactivecontrol.h
 	mod_interactivecontrol.cpp
 )

Module/mod_interactivecontrol/Event.h

@@ -0,0 +1,46 @@
+#pragma once
+
+/*----InteractiveControl----*/
+#define LOG_EVT_UI_STARTRECORD						0x30B00001				//开始录像
+#define LOG_EVT_UI_STOPRECORD						0x30B00002				//停止录像
+#define LOG_EVT_UI_SHOWVIDEO						0x30B00003				//播放录像
+#define LOG_EVT_UI_SAVEVIDEO						0x30B00004				//确认录像
+#define LOG_EVT_UI_DELETEVIDEO						0x30B00005				//放弃录像
+#define LOG_EVT_UI_RETURNMENU						0x30B00006				//退出到主菜单
+#define LOG_EVT_UI_STARTPHOTOGRAPH					0x30B00007				//开始复杂产品合同拍照
+#define LOG_EVT_UI_STOPPHOTOGRAPH					0x30B00008				//停止复杂产品合同拍照
+#define LOG_EVT_UI_SENDOPERATESTATE					0x30B00009				//UI发送操作状态，用于业务层锁定交易页面
+#define LOG_EVT_UI_START_CONTINURECORD				0x30B0000A				//开始全程录像
+#define LOG_EVT_UI_STOP_CONTINURECORD				0x30B0000B				//停止全程录像
+#define LOG_EVT_UI_START_ECHO_CONTINURECORD			0x30B0000C				//开始回显全程录像
+#define LOG_EVT_UI_STOP_ECHO_CONTINURECORD			0x30B0000D				//停止回显全程录像
+#define LOG_EVT_UI_VIDEOAPPENDWATERMARK				0x30B0000E				//双录视频追加水印
+#define LOG_EVT_UI_STARTREMOTERECORD				0x30B0000F				//开始远程双录
+#define LOG_EVT_UI_STOPREMOTERECORD					0x30B00018				//停止远程录像
+#define LOG_EVT_UI_HIDEONLINEVIDEO					0x30B00010				//隐藏视频连线窗口
+#define LOG_EVT_UI_SHOWONLINEVIDEO					0x30B00011				//显示视频连线窗口
+#define LOG_EVT_UI_HIDELOCALVIDEO					0x30B00012				//隐藏本地视频窗口
+#define LOG_EVT_UI_SHOWLOCALVIDEO					0x30B00013				//显示本地视频窗口
+#define LOG_EVT_UI_HIDEPERSONAREA					0x30B00014				//隐藏人形框
+#define LOG_EVT_UI_SHOWPERSONAREA					0x30B00015				//显示隐藏人形框
+#define LOG_EVT_UI_STARTRECORDPREVIEW				0x30B00A01				//开始录像预览
+#define LOG_EVT_UI_STOPRECORDPREVIEW				0x30B00A02				//停止录像预览
+#define LOG_EVT_UI_STARTAFTERPREVIEWRECORD			0x30B00A03				//开始预览后录像
+#define LOG_EVT_UI_ADJUSTVIDEOECHOSIZE				0x30B00A04				//调整视频回显框大小
+#define LOG_EVT_LOCALMEDIAPLAYER_LOST				0x30B00B01				//本地媒体播放lost
+#define LOG_EVT_PLAYER_CANNTFIND_FILE				0x30B00B02				//找不到要播放的文件
+#define LOG_EVT_OPEN_ADV_FROM_LOCAL_CONFIG			0x30B00B03		     	//通过本地配置要求打开广告播放
+#define LOG_EVT_FORBIDDIEN_ADV_FROM_LOCAL_CONFIG	0x30B00B04 				//通过本地配置要求关闭广告播放
+
+
+#define LOG_EVT_START_REMOTERECORD_SUCCESS			0x30B10001				//启动远程双录成功
+#define LOG_EVT_START_REMOTERECORD_FAILED			0x30B10002				//启动远程双录失败
+#define LOG_EVT_STOP_REMOTERECORD_SUCCESS			0x30B10003				//停止远程录像成功
+#define LOG_EVT_STOP_REMOTERECORD_FAILED			0x30B10004				//停止远程录像失败
+#define LOG_EVT_SAVE_RECORD_SUCCESS					0x30B10005				//保存录像成功
+#define LOG_EVT_SAVE_RECORD_FAILED					0x30B10006				//保存录像失败
+
+#define LOG_EVT_CONNECT_LOCALPLAYER_FAILED			0x30B1000A				//连接本地播放实体失败
+#define LOG_EVT_CONNECT_SALESRECORD_FAILED			0x30B1000B				//连接销售录像实体失败
+
+/*----End--InteractiveControl------------------------------*/

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -1269,6 +1269,7 @@ ErrorCodeEnum CITCtrlEntity::SaveVideo(CSimpleStringA strVideoName)
 	auto rc = Error_Succeed;
 
 	if(ConnectToSalesRecord() != Error_Succeed){
+		LogError(Severity_High, Error_Debug, LOG_EVT_SAVE_RECORD_FAILED, "save record failed for connect SalesClient failed!");
 		rc = Error_DevConnFailed;
 	}
 	else
@@ -1298,6 +1299,7 @@ ErrorCodeEnum CITCtrlEntity::StartRemoteRecord(CSimpleStringA strVideoName)
 	if (ConnectToSalesRecord() != Error_Succeed)
 	{
 		rc = Error_DevConnFailed;
+		LogError(Severity_High, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "start remote record failed for connect SalesClient failed!");
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("StartRemoteRecord SalesClient connected failed!");
 	}
 	else
@@ -1327,6 +1329,7 @@ ErrorCodeEnum CITCtrlEntity::StopRecord(CSimpleStringA strVideoName)
 	{
 		rc = Error_DevConnFailed;
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("StopRecord SalesClient connected failed!");
+		LogError(Severity_High, Error_Debug, LOG_EVT_STOP_REMOTERECORD_FAILED, "stop remote record failed for connect SalesClient failed!");
 	}
 	else
 	{
@@ -1339,6 +1342,9 @@ ErrorCodeEnum CITCtrlEntity::StopRecord(CSimpleStringA strVideoName)
 		}
 		else{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop record %s failed for 0x%08x",strVideoName.GetData(), rc);
+			char strmsg[MAX_PATH] = { 0 };
+			_snprintf(strmsg, MAX_PATH, "Stop record %s failed for 0x%08x", strVideoName.GetData(), rc);
+			LogError(Severity_High, Error_Debug, LOG_EVT_STOP_REMOTERECORD_FAILED, strmsg);
 		}
 	}
 
@@ -1514,7 +1520,7 @@ ErrorCodeEnum CITCtrlEntity::ConnectToLocalPlay(bool blogevt)
 		if (FAILURED(erroCode)){
 			m_pPlayClient = NULL;
 			if (blogevt) {
-				LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_CONNECT_LOCALPLAY_FAILED,
+				LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_CONNECT_LOCALPLAYER_FAILED,
 					CSimpleStringA::Format("Connect to localplayer entity failed:0x%X", erroCode));
 			}
 			return Error_InvalidState;
@@ -1534,7 +1540,7 @@ ErrorCodeEnum CITCtrlEntity::ConnectToSalesRecord(bool blogevt)
 		if (FAILURED(erroCode)){
 			m_pSalesRecordClient = NULL;
 			if (blogevt) {
-				LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_CONNECT_SAELSRECORD_FAILED,
+				LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_CONNECT_SALESRECORD_FAILED,
 					CSimpleStringA::Format("Connect to sales record entity failed:0x%X", erroCode));
 			}
 			return Error_InvalidState;
@@ -1857,7 +1863,7 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
 			rc = Error_InvalidState;
 			ctx->Ans.ErrorCode = Error_InvalidState;
 			ctx->Ans.ErrorMsg = CSimpleStringA2W("");
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "start remote record for connect salesrecord entity failed!");
+			LogError(Severity_High, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "start remote record for connect sales record entity failed!");
 		}
 	}
 	else if(camstate[0] == 'I') {
@@ -1994,7 +2000,7 @@ void UIServiceSession::Handle_StartPlayNotice(SpReqAnsContext<UIService_StartPla
 		ctx->Ans.ErrorCode = Error_DevConnFailed;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("StartPlayNotice, Connect PlayClient entity failed!");
 		Error = Error_DevConnFailed;
-		LogWarn(Severity_Low, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StartPlayNotice call");
+		LogError(Severity_High, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StartPlayNotice, Connect PlayClient entity failed!");
 	}
 	else{
 		PlayService_StartPlayNotice_Req req;
@@ -2021,7 +2027,7 @@ void UIServiceSession::Handle_StopPlayNotice(SpReqAnsContext<UIService_StopPlayN
 		ctx->Ans.ErrorCode = Error_DevConnFailed;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("StopPlayNotice, Connect PlayClient entity failed!");
 		Error = Error_DevConnFailed;
-		LogWarn(Severity_Low, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StopPlayNotice call");
+		LogError(Severity_High, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StopPlayNotice, Connect PlayClient entity failed!");
 	}
 	else{
 		PlayService_StopPlayNotice_Req req;

Module/mod_interactivecontrol/mod_interactivecontrol.h

@@ -3,6 +3,7 @@
 #include "SpBase.h"
 #include "SpIni.h"
 #include "../include/EventCode.h"
+#include "Event.h"
 
 #include "InteractiveControl_msg_g.h"
 #include "InteractiveControl_server_g.h"

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -4,6 +4,7 @@
 #include "fileutil.h"
 #include "y2k_time.h"
 #include "../../Other/rvcmediacommon/rvc_media_common.h"
+#include "../mod_interactivecontrol/Event.h"
 
 #define DEFAULT_SLEEP_TIME		(60 * 1000)
 #define DEFAULT_ADVERT_TYPE		'A'

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -4,7 +4,7 @@
 #include "Event.h"
 #include "../../Other/libaudiorender/iaudiorenderinterface.h"
 #include "mod_mediacontroller.h"
-
+#include "../mod_interactivecontrol/Event.h"
 #include "../mod_snapshot/Event.h"
 
 #define AUTOMATCH_CAMERA_ENV	"ENV_"

Module/mod_sipphone/mod_sipphone.cpp

@@ -11,6 +11,8 @@
 
 #include "../../Other/rvcmediacommon/rvc_media_common.h"
 
+#include "../mod_interactivecontrol/Event.h"
+
 #include "audio_session.h"
 #include "video_session.h"