|
@@ -43,7 +43,7 @@ struct CRecvValue
|
|
|
|
|
|
void CITCtrlEntity::OnAudioPlayRet(const char *pszEntityName, DWORD dwMessageId, DWORD dwMessageSignature, LocalMediaPlay::AudioPlayRet &evt)
|
|
|
{
|
|
|
- Dbg("AudioPlayRet %s", (LPCTSTR)evt.AudioNames);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AudioPlayRet %s", (LPCTSTR)evt.AudioNames);
|
|
|
AudioEndRet ret;
|
|
|
ret.ret = evt.ret;
|
|
|
ret.AudioNames = evt.AudioNames;
|
|
@@ -61,7 +61,7 @@ void CITCtrlEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<
|
|
|
{
|
|
|
auto Error = GetFunction()->SubscribeBroadcast("LocalMediaPlay", NULL, this, m_uidLocalMediaListenser);
|
|
|
if (Error != Error_Succeed) {
|
|
|
- LOG_TRACE("subscribe LocalMediaPlay evt failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe LocalMediaPlay evt failed!");
|
|
|
}
|
|
|
|
|
|
Error = __OnStart(Error_Succeed);
|
|
@@ -122,22 +122,22 @@ void CITCtrlEntity::OnStarted()
|
|
|
m_pPlayClient = new LocalPlayClient(this);
|
|
|
Error = m_pPlayClient->Connect();
|
|
|
if (Error != Error_Succeed){
|
|
|
- Dbg("Fail to connect to LocalPlayClient, with error = %d!", Error);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Fail to connect to LocalPlayClient, with error = %d!", Error);
|
|
|
m_pPlayClient->SafeDelete();
|
|
|
m_pPlayClient = NULL;
|
|
|
return;
|
|
|
}
|
|
|
- Dbg("Succeed to connect to LocalPlayClient!");
|
|
|
+ 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) {
|
|
|
- Dbg("Fail to connect to SalesRecordClient, with error = %d!", Error);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Fail to connect to SalesRecordClient, with error = %d!", Error);
|
|
|
m_pSalesRecordClient->SafeDelete();
|
|
|
m_pSalesRecordClient = NULL;
|
|
|
return;
|
|
|
}
|
|
|
- Dbg("Succeed to connect to SalesRecordClient!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Succeed to connect to SalesRecordClient!");
|
|
|
}
|
|
|
|
|
|
|
|
@@ -179,7 +179,7 @@ DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
|
|
|
eType = eDesk2SType;
|
|
|
WORD nMajor = stStaticinfo.MachineVersion.GetMajor();
|
|
|
WORD nMinor = stStaticinfo.MachineVersion.GetMinor();
|
|
|
- Dbg("MachineVersion is %d.%d", nMajor, nMinor);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("MachineVersion is %d.%d", nMajor, nMinor);
|
|
|
if (2 == nMajor) {
|
|
|
eType = eDesk2SIntegratedType;
|
|
|
}
|
|
@@ -195,7 +195,7 @@ DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
|
|
|
}
|
|
|
|
|
|
if (eType >= 0 && eType < sizeof(Device_Type_Table) / sizeof(char*)) {
|
|
|
- Dbg("device type is %s.", Device_Type_Table[eType]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("device type is %s.", Device_Type_Table[eType]);
|
|
|
}
|
|
|
|
|
|
return eType;
|
|
@@ -210,12 +210,12 @@ ErrorCodeEnum CITCtrlEntity::__OnStart(ErrorCodeEnum preOperationError)
|
|
|
|
|
|
auto Error = pFunc->RegistSysVarEvent("CustomerHandle", this);
|
|
|
if (Error != Error_Succeed){
|
|
|
- LOG_TRACE("register sysvar %s failed!", "CustomerHandle");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerHandle");
|
|
|
}
|
|
|
|
|
|
Error = pFunc->RegistSysVarEvent("SessionID", this);
|
|
|
if (Error != Error_Succeed){
|
|
|
- LOG_TRACE("register sysvar %s failed!", "SessionID");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "SessionID");
|
|
|
}
|
|
|
m_nSysCallType = 0;
|
|
|
{
|
|
@@ -260,7 +260,7 @@ ErrorCodeEnum CITCtrlEntity::__OnStart(ErrorCodeEnum preOperationError)
|
|
|
m_bAdvOnFlag = true;
|
|
|
}
|
|
|
}
|
|
|
- Dbg("AdvOnFlag:[%s]", m_bAdvOnFlag ? "true" : "false");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AdvOnFlag:[%s]", m_bAdvOnFlag ? "true" : "false");
|
|
|
}
|
|
|
|
|
|
if (!(eMobilePadType==m_eDeviceType|| IsSurpportContinuRecordType()))
|
|
@@ -322,14 +322,14 @@ void CITCtrlEntity::AdverPlayManage(const char* pszValue, const char* pszOldValu
|
|
|
{
|
|
|
if (pszValue && pszOldValue)
|
|
|
{
|
|
|
- Dbg("Current Customer State is %c, Old Customer State is %c", pszValue[0], pszOldValue[0]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Current Customer State is %c, Old Customer State is %c", pszValue[0], pszOldValue[0]);
|
|
|
if ('N' == pszValue[0]){
|
|
|
- Dbg("%s StartPlayVideo", __FUNCTION__);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s StartPlayVideo", __FUNCTION__);
|
|
|
StartPlayVideo(1, 0, 0, 0, 0, 800);
|
|
|
}
|
|
|
else {
|
|
|
if ('N' == pszOldValue[0]){
|
|
|
- Dbg("%s StopPlayVideo", __FUNCTION__);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s StopPlayVideo", __FUNCTION__);
|
|
|
StopPlayVideo(1, 800);
|
|
|
}
|
|
|
}
|
|
@@ -359,7 +359,7 @@ void CITCtrlEntity::BcastCustomerState(const char *pszValue,const char *pszOldVa
|
|
|
}
|
|
|
else {
|
|
|
ok = 0;
|
|
|
- LOG_TRACE("bug! OnSysVarEvent unknown %s", pszValue);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("bug! OnSysVarEvent unknown %s", pszValue);
|
|
|
}
|
|
|
GetFunction()->GetSysVar("SessionID",m_SessionID);
|
|
|
evt.session_id = CSimpleStringA2W(m_SessionID);
|
|
@@ -372,7 +372,7 @@ void CITCtrlEntity::BcastSessionid(const char *sessionid,const char *pszEntityNa
|
|
|
{
|
|
|
CSimpleStringA pszValue;
|
|
|
GetFunction()->GetSysVar("CustomerHandle", pszValue);
|
|
|
- Dbg("CustomerHandle = %c",pszValue[0]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CustomerHandle = %c",pszValue[0]);
|
|
|
CustomerState evt;
|
|
|
int ok = 1;
|
|
|
if (pszValue[0] == 'N') { // None
|
|
@@ -394,7 +394,7 @@ void CITCtrlEntity::BcastSessionid(const char *sessionid,const char *pszEntityNa
|
|
|
else
|
|
|
{
|
|
|
ok = 0;
|
|
|
- LOG_TRACE("bug! OnSysVarEvent unknown %s", pszValue);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("bug! OnSysVarEvent unknown %s", pszValue);
|
|
|
}
|
|
|
GetFunction()->GetSysVar("SessionID",m_SessionID);
|
|
|
evt.session_id = CSimpleStringA2W(m_SessionID);
|
|
@@ -406,7 +406,7 @@ void CITCtrlEntity::BcastSessionid(const char *sessionid,const char *pszEntityNa
|
|
|
|
|
|
void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const char *pszOldValue,const char *pszEntityName)
|
|
|
{
|
|
|
- LOG_TRACE("entity:%s key:%s value:%s", pszEntityName, pszKey, pszValue);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("entity:%s key:%s value:%s", pszEntityName, pszKey, pszValue);
|
|
|
if (_stricmp(pszKey,"CustomerHandle") == 0)
|
|
|
{
|
|
|
if (pszValue)
|
|
@@ -417,14 +417,14 @@ void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const
|
|
|
}
|
|
|
#endif
|
|
|
BcastCustomerState(pszValue, pszOldValue, pszEntityName);
|
|
|
- Dbg("CustomerState change to %c",pszValue[0]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CustomerState change to %c",pszValue[0]);
|
|
|
}
|
|
|
}
|
|
|
else if (_stricmp(pszKey, "UIState") == 0) {
|
|
|
#ifdef RVC_OS_LINUX
|
|
|
if (_strnicmp(pszValue, "M", strlen("M")) == 0)
|
|
|
{
|
|
|
- Dbg("return Main path");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("return Main path");
|
|
|
LogEvent(Severity_Middle, LOG_EVT_UI_RETURNMENU, NULL);
|
|
|
}
|
|
|
#endif
|
|
@@ -433,10 +433,10 @@ void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const
|
|
|
{
|
|
|
CSimpleStringA strSessionID;
|
|
|
GetFunction()->GetSysVar("SessionID",strSessionID);
|
|
|
- Dbg("Sessionid change to %s",strSessionID.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sessionid change to %s",strSessionID.GetData());
|
|
|
BcastSessionid(strSessionID,pszEntityName);
|
|
|
}
|
|
|
- else if (_stricmp(pszKey,"CameraState") == 0) // add by ly 20160708(edit by ly 2018/03/08)
|
|
|
+ else if (_stricmp(pszKey,"CameraState") == 0)
|
|
|
{
|
|
|
if (pszValue)
|
|
|
{
|
|
@@ -449,7 +449,7 @@ void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const
|
|
|
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);
|
|
|
- Dbg("[dbg] CameraFaultOccurred broadcast sent!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[dbg] CameraFaultOccurred broadcast sent!");
|
|
|
}
|
|
|
|
|
|
CSmartPointer<IEntityFunction> Func = GetFunction();
|
|
@@ -478,21 +478,21 @@ void CITCtrlEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const
|
|
|
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);
|
|
|
- Dbg("[dbg] CameraFaultOccurred broadcast sent!");
|
|
|
+ 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
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(WideAngleCameraFault), SP_MSG_SIG_OF(WideAngleCameraFault), evt);
|
|
|
- Dbg("[dbg] WideAngleCameraFault broadcast sent!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[dbg] WideAngleCameraFault broadcast sent!");
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STOP_CONTINURECORD,"Fault");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
else if (_stricmp(pszKey, SYSVAR_CALLTYPE) == 0)
|
|
|
{
|
|
|
- Dbg("sys call type from: %c to %c", pszOldValue[0], pszValue[0]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sys call type from: %c to %c", pszOldValue[0], pszValue[0]);
|
|
|
if(pszValue[0] == CALLTYPE_NORMAL)
|
|
|
{
|
|
|
m_nSysCallType = 0;
|
|
@@ -522,7 +522,7 @@ void CITCtrlEntity::SyncMenuTree(int tree, int path)
|
|
|
buf.OpenWrite(32 + m_strMenuTree.GetLength() * 2);
|
|
|
CSimpleString16Bit menuTree = CSimpleStringW216Bit(m_strMenuTree);
|
|
|
buf& menuTree;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuTree).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuTree).GetData());
|
|
|
ChannelService_Send_Info Info;
|
|
|
Info.sub_type = ACM_IM_MENUTREE;
|
|
|
Info.type = ACM_TYPE_IM;
|
|
@@ -533,13 +533,13 @@ void CITCtrlEntity::SyncMenuTree(int tree, int path)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
}
|
|
|
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("warning: slv has not set menu tree!!!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("warning: slv has not set menu tree!!!");
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -552,7 +552,7 @@ void CITCtrlEntity::SyncMenuTree(int tree, int path)
|
|
|
buf.OpenWrite(32 + m_strMenuPath.GetLength()*2);
|
|
|
CSimpleString16Bit menuPath = CSimpleStringW216Bit(m_strMenuPath);
|
|
|
buf& menuPath;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuPath).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuPath).GetData());
|
|
|
ChannelService_Send_Info Info;
|
|
|
Info.sub_type = ACM_IM_MENUPATH;
|
|
|
Info.type = ACM_TYPE_IM;
|
|
@@ -563,12 +563,12 @@ void CITCtrlEntity::SyncMenuTree(int tree, int path)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("warning: slv has not set menu path!!!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("warning: slv has not set menu path!!!");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -581,7 +581,7 @@ ErrorCodeEnum CITCtrlEntity::SendAgentText(CSimpleStringW strText)
|
|
|
buf.OpenWrite(32 + strText.GetLength()*2);
|
|
|
CSimpleString16Bit convertData = CSimpleStringW216Bit(strText);
|
|
|
buf& convertData;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertData).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertData).GetData());
|
|
|
ChannelService_Send_Info Info;
|
|
|
Info.sub_type = ACM_IM_SHOWTEXT;
|
|
|
Info.type = ACM_TYPE_IM;
|
|
@@ -592,7 +592,7 @@ ErrorCodeEnum CITCtrlEntity::SendAgentText(CSimpleStringW strText)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
return Error_Succeed;
|
|
|
}
|
|
|
}
|
|
@@ -609,7 +609,7 @@ void CITCtrlEntity::SetMenuTreePath(CSimpleStringW strMenuPath)
|
|
|
CSimpleStringA string = CSimpleStringW2A(m_strMenuPath);
|
|
|
if (string == "Main")
|
|
|
{
|
|
|
- Dbg("return Main path");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("return Main path");
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_RETURNMENU,NULL);
|
|
|
}
|
|
|
}
|
|
@@ -626,7 +626,7 @@ ErrorCodeEnum CITCtrlEntity::SendFrontSyncData(int id, CSimpleStringW strContent
|
|
|
buf& id;
|
|
|
CSimpleString16Bit convertedData = CSimpleStringW216Bit(strContent);
|
|
|
buf& convertedData;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
#endif //RVC_OS_WIN
|
|
|
ChannelService_Send_Info Info;
|
|
|
Info.sub_type = ACM_IM_FRONTSYNC;
|
|
@@ -638,7 +638,7 @@ ErrorCodeEnum CITCtrlEntity::SendFrontSyncData(int id, CSimpleStringW strContent
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
return Error_Succeed;
|
|
|
}
|
|
|
}
|
|
@@ -654,7 +654,7 @@ ErrorCodeEnum CITCtrlEntity::SendH5SyncData(CSimpleStringW strContent)
|
|
|
#else
|
|
|
CSimpleString16Bit convertedData = CSimpleStringW216Bit(strContent);
|
|
|
buf& convertedData;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
#endif //RVC_OS_WIN
|
|
|
|
|
|
ChannelService_Send_Info Info;
|
|
@@ -667,7 +667,7 @@ ErrorCodeEnum CITCtrlEntity::SendH5SyncData(CSimpleStringW strContent)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
return Error_Succeed;
|
|
|
}
|
|
|
}
|
|
@@ -708,7 +708,7 @@ void CITCtrlEntity::OnReceivePacket(int type,int sub_type, const char *data, int
|
|
|
buf & content16;
|
|
|
CSimpleStringA reqContextA = CSimpleString16Bit2A(content16);
|
|
|
CSimpleStringW reqContextW = CSimpleStringA2W(reqContextA);
|
|
|
- Dbg("RecvAgentText is %s.", reqContextA.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RecvAgentText is %s.", reqContextA.GetData());
|
|
|
evt.content = reqContextW;
|
|
|
#endif // RVC_OS_WIN
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(RecvAgentText), SP_MSG_SIG_OF(RecvAgentText), evt);
|
|
@@ -735,7 +735,7 @@ void CITCtrlEntity::OnReceivePacket(int type,int sub_type, const char *data, int
|
|
|
evt.Serialize(buf);
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(EnterSubMenu), SP_MSG_SIG_OF(EnterSubMenu), evt);
|
|
|
SendAnswer(ACM_IM_ANS | sub_type, Error_Succeed);
|
|
|
- Dbg("send broadcast EnterSubMenu!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send broadcast EnterSubMenu!");
|
|
|
}
|
|
|
else if (sub_type == ACM_IM_MENUGOPARENT)
|
|
|
{
|
|
@@ -745,7 +745,7 @@ void CITCtrlEntity::OnReceivePacket(int type,int sub_type, const char *data, int
|
|
|
evt.Serialize(buf);
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(EnterParentMenu), SP_MSG_SIG_OF(EnterParentMenu), evt);
|
|
|
SendAnswer(ACM_IM_ANS | sub_type, Error_Succeed);
|
|
|
- Dbg("send broadcast EnterParentMenu!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send broadcast EnterParentMenu!");
|
|
|
}
|
|
|
else if (sub_type == ACM_IM_BACKSYNC)
|
|
|
{
|
|
@@ -780,7 +780,7 @@ void CITCtrlEntity::OnReceivePacket(int type,int sub_type, const char *data, int
|
|
|
//evt.Serialize(buf);
|
|
|
RecvP2pFlwReq evt;
|
|
|
evt.content = (wchar_t*)data;
|
|
|
- Dbg("lens = %d",evt.content.GetLength());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("lens = %d",evt.content.GetLength());
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(RecvP2pFlwReq), SP_MSG_SIG_OF(RecvP2pFlwReq), evt);
|
|
|
}
|
|
|
else
|
|
@@ -799,7 +799,7 @@ void CITCtrlEntity::OnReceivePacket(int type,int sub_type, const char *data, int
|
|
|
buf.OpenRead(data,size);
|
|
|
RecValue.Serialize(buf);
|
|
|
evt.value = RecValue.nValue;
|
|
|
- Dbg("Broadcast webmsg sub_type=%d,value=%d",evt.type,evt.value);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Broadcast webmsg sub_type=%d,value=%d",evt.type,evt.value);
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(CommonWebMsg), SP_MSG_SIG_OF(CommonWebMsg), evt);
|
|
|
}
|
|
|
else
|
|
@@ -827,7 +827,7 @@ void CITCtrlEntity::SendAnswer(int sub_type, ErrorCodeEnum Error)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("cur call type cannot send pkt");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("cur call type cannot send pkt");
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -837,7 +837,7 @@ void CITCtrlEntity::SendAnswertoMobile(CSimpleStringW packet)
|
|
|
buf.OpenWrite();
|
|
|
CSimpleString16Bit convertedData = CSimpleStringW216Bit(packet);
|
|
|
buf& convertedData;
|
|
|
- Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
|
|
|
ChannelService_Send_Info Info;
|
|
|
Info.sub_type = ACM_SUBTYPE_ANS_FLOW;
|
|
|
Info.compress = true;
|
|
@@ -1019,11 +1019,11 @@ ErrorCodeEnum CITCtrlEntity::SetLocalAudioVolume(int nVolume, DWORD dwTimeout)
|
|
|
|
|
|
ErrorCodeEnum CITCtrlEntity::SendBusinessDesktopCmd(CSimpleStringA xapName, CSimpleStringA command)
|
|
|
{
|
|
|
- Dbg("in entity SendBusinessDesktopCmd");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("in entity SendBusinessDesktopCmd");
|
|
|
EnterBFlowFromUT evt;
|
|
|
evt.xapName = CSimpleStringA2W(xapName);
|
|
|
evt.command = CSimpleStringA2W(command);
|
|
|
- Dbg("xapName = %s, command = %s", evt.xapName, evt.command);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("xapName = %s, command = %s", evt.xapName, evt.command);
|
|
|
SpSendBroadcast(GetFunction(), SP_MSG_OF(EnterBFlowFromUT), SP_MSG_SIG_OF(EnterBFlowFromUT), evt);
|
|
|
return Error_Succeed;
|
|
|
}
|
|
@@ -1041,18 +1041,18 @@ ErrorCodeEnum CITCtrlEntity::GetHandfreeCallOutVolume(int& nVolume, DWORD dwTime
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("pSipPhoneClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("pSipPhoneClient connected success!");
|
|
|
PhoneService_GetHandfreeOutVolume_Req req;
|
|
|
PhoneService_GetHandfreeOutVolume_Ans ans;
|
|
|
rc = pSipPhoneClient->GetHandfreeOutVolume(req, ans, 1000);
|
|
|
nVolume = ans.Volume;
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("get hand free out volume success.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get hand free out volume success.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("get hand free out volume failed for 0x%08x", rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get hand free out volume failed for 0x%08x", rc);
|
|
|
}
|
|
|
|
|
|
pSipPhoneClient->GetFunction()->CloseSession();
|
|
@@ -1076,18 +1076,18 @@ ErrorCodeEnum CITCtrlEntity::SetHandfreeCallOutVolume(int nVolume, DWORD dwTimeo
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("pSipPhoneClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("pSipPhoneClient connected success!");
|
|
|
PhoneService_SetHandfreeOutVolume_Req req;
|
|
|
req.Volume = nVolume;
|
|
|
PhoneService_SetHandfreeOutVolume_Ans ans;
|
|
|
rc = pSipPhoneClient->SetHandfreeOutVolume(req, ans, 1000);
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("set hand free out volume success.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set hand free out volume success.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("set hand free out volume failed for 0x%08x", rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set hand free out volume failed for 0x%08x", rc);
|
|
|
}
|
|
|
|
|
|
pSipPhoneClient->GetFunction()->CloseSession();
|
|
@@ -1111,18 +1111,18 @@ ErrorCodeEnum CITCtrlEntity::GetPickupCallOutVolume(int& nVolume, DWORD dwTimeou
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("pSipPhoneClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("pSipPhoneClient connected success!");
|
|
|
PhoneService_GetPickupOutVolume_Req req;
|
|
|
PhoneService_GetPickupOutVolume_Ans ans;
|
|
|
rc = pSipPhoneClient->GetPickupOutVolume(req, ans, 1000);
|
|
|
nVolume = ans.Volume;
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("get pickup out volume success.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get pickup out volume success.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("get pickup out volume failed for 0x%08x", rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get pickup out volume failed for 0x%08x", rc);
|
|
|
}
|
|
|
|
|
|
pSipPhoneClient->GetFunction()->CloseSession();
|
|
@@ -1145,18 +1145,18 @@ ErrorCodeEnum CITCtrlEntity::SetPickupCallOutVolume(int nVolume, DWORD dwTimeout
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("pSipPhoneClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("pSipPhoneClient connected success!");
|
|
|
PhoneService_SetPickupOutVolume_Req req;
|
|
|
req.Volume = nVolume;
|
|
|
PhoneService_SetPickupOutVolume_Ans ans;
|
|
|
rc = pSipPhoneClient->SetPickupOutVolume(req, ans, 1000);
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("set pickup out volume success.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set pickup out volume success.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("set pickup out volume failed for 0x%08x", rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set pickup out volume failed for 0x%08x", rc);
|
|
|
}
|
|
|
|
|
|
pSipPhoneClient->GetFunction()->CloseSession();
|
|
@@ -1169,7 +1169,7 @@ ErrorCodeEnum CITCtrlEntity::SetPickupCallOutVolume(int nVolume, DWORD dwTimeout
|
|
|
const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID,
|
|
|
const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext& pLinkInfo)
|
|
|
{
|
|
|
- Dbg("user_code = %08x", dwUserCode);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("user_code = %08x", dwUserCode);
|
|
|
switch (dwUserCode) {
|
|
|
case 0x40100002: // AgentInputState_Writing
|
|
|
{
|
|
@@ -1188,24 +1188,24 @@ ErrorCodeEnum CITCtrlEntity::SetPickupCallOutVolume(int nVolume, DWORD dwTimeout
|
|
|
|
|
|
case LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE:
|
|
|
{
|
|
|
- Dbg("recv LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE");
|
|
|
if (m_pChannelClient!=NULL)
|
|
|
{
|
|
|
m_pChannelClient->GetFunction()->CloseSession();
|
|
|
m_pChannelClient = NULL;
|
|
|
- Dbg("Close AssistChannel Session ");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Close AssistChannel Session ");
|
|
|
}
|
|
|
|
|
|
if (m_pChannelClient == NULL)
|
|
|
{
|
|
|
- Dbg("ReConnection AssistChannel Session");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReConnection AssistChannel Session");
|
|
|
m_pChannelClient = new ChannelClient(this);
|
|
|
ErrorCodeEnum Error = m_pChannelClient->Connect();
|
|
|
if (Error != Error_Succeed)
|
|
|
{
|
|
|
m_pChannelClient->SafeDelete();
|
|
|
m_pChannelClient = NULL;
|
|
|
- Dbg("m_pChannelClient connect fail!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_pChannelClient connect fail!");
|
|
|
}
|
|
|
|
|
|
if (Error == Error_Succeed)
|
|
@@ -1242,30 +1242,30 @@ ErrorCodeEnum CITCtrlEntity::SetPickupCallOutVolume(int nVolume, DWORD dwTimeout
|
|
|
break;
|
|
|
case LOG_EVT_SELFCHECK_LOCALMEDIAPLAY_IDLE:
|
|
|
{
|
|
|
- Dbg("recv LOG_EVT_SELFCHECK_LOCALMEDIAPLAY_IDLE");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_SELFCHECK_LOCALMEDIAPLAY_IDLE");
|
|
|
if (m_pPlayClient!=NULL)
|
|
|
{
|
|
|
m_pPlayClient->GetFunction()->CloseSession();
|
|
|
m_pPlayClient = NULL;
|
|
|
- Dbg("Close AssistChannel Session ");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Close AssistChannel Session ");
|
|
|
}
|
|
|
|
|
|
if (m_pPlayClient == NULL)
|
|
|
{
|
|
|
- Dbg("ReConnection LocalPlay Session");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReConnection LocalPlay Session");
|
|
|
m_pPlayClient = new LocalPlayClient(this);
|
|
|
ErrorCodeEnum Error = m_pPlayClient->Connect();
|
|
|
if (Error != Error_Succeed)
|
|
|
{
|
|
|
m_pPlayClient->SafeDelete();
|
|
|
- Dbg("m_pPlayClient connect fail!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_pPlayClient connect fail!");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
case LOG_EVT_CONTINURECORD_FAILED:
|
|
|
{
|
|
|
- Dbg("recv LOG_EVT_CONTINURECORD_FAILED");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_CONTINURECORD_FAILED");
|
|
|
}
|
|
|
break;
|
|
|
default:
|
|
@@ -1297,16 +1297,16 @@ ErrorCodeEnum CITCtrlEntity::PlayVideo(CSimpleStringA strVideoName)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("SalesClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SalesClient connected success!");
|
|
|
SalesRecorderSerVice_PlayVideo_Req req;
|
|
|
SalesRecorderSerVice_PlayVideo_Ans ans;
|
|
|
req.VideoName = CSimpleStringA2W(strVideoName);
|
|
|
rc = m_pSalesRecordClient->PlayVideo(req, ans, 5000);
|
|
|
if(Error_Succeed == rc){
|
|
|
- Dbg("Play video %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Play video %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else{
|
|
|
- Dbg("Play video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Play video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1324,7 +1324,7 @@ ErrorCodeEnum CITCtrlEntity::StartPlaySalesRecordVideo(CSimpleStringA strVideoNa
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("SalesClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SalesClient connected success!");
|
|
|
SalesRecorderSerVice_PlaySalesRecord_Req req;
|
|
|
SalesRecorderSerVice_PlaySalesRecord_Ans ans;
|
|
|
req.VideoName = CSimpleStringA2W(strVideoName);
|
|
@@ -1335,11 +1335,11 @@ ErrorCodeEnum CITCtrlEntity::StartPlaySalesRecordVideo(CSimpleStringA strVideoNa
|
|
|
rc = m_pSalesRecordClient->PlaySalesRecord(req, ans, 5000);
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("Play Sales Record %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Play Sales Record %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("Play Sales Record %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Play Sales Record %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1355,18 +1355,18 @@ ErrorCodeEnum CITCtrlEntity::StopShowVideo(CSimpleStringA strVideoName)
|
|
|
rc = Error_DevConnFailed;
|
|
|
}
|
|
|
else{
|
|
|
- Dbg("SalesClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SalesClient connected success!");
|
|
|
SalesRecorderSerVice_StopShowVideo_Req req;
|
|
|
SalesRecorderSerVice_StopShowVideo_Ans ans;
|
|
|
req.VideoName = CSimpleStringA2W(strVideoName);
|
|
|
rc = m_pSalesRecordClient->StopShowVideo(req, ans, 5000);
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("Stop Show video %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Show video %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("Stop Show video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Show video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1383,18 +1383,18 @@ ErrorCodeEnum CITCtrlEntity::SaveVideo(CSimpleStringA strVideoName)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("SalesClient connected success!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SalesClient connected success!");
|
|
|
SalesRecorderSerVice_SaveVideo_Req req;
|
|
|
SalesRecorderSerVice_SaveVideo_Ans ans;
|
|
|
req.VideoName = CSimpleStringA2W(strVideoName);
|
|
|
rc = m_pSalesRecordClient->SaveVideo(req, ans, 5000);
|
|
|
if(Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("Save video %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Save video %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("Save video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Save video %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1408,7 +1408,7 @@ ErrorCodeEnum CITCtrlEntity::StartRemoteRecord(CSimpleStringA strVideoName)
|
|
|
if (ConnectToSalesRecord() != Error_Succeed)
|
|
|
{
|
|
|
rc = Error_DevConnFailed;
|
|
|
- Dbg("StartRemoteRecord SalesClient connected failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("StartRemoteRecord SalesClient connected failed!");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1418,11 +1418,11 @@ ErrorCodeEnum CITCtrlEntity::StartRemoteRecord(CSimpleStringA strVideoName)
|
|
|
rc = m_pSalesRecordClient->StartRemoteRecord(req, ans, 5000);
|
|
|
if (Error_Succeed == rc)
|
|
|
{
|
|
|
- Dbg("Start remote record %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start remote record %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Dbg("Start remote record %s failed for 0x%08x", strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start remote record %s failed for 0x%08x", strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1436,7 +1436,7 @@ ErrorCodeEnum CITCtrlEntity::StopRecord(CSimpleStringA strVideoName)
|
|
|
if(ConnectToSalesRecord()!= Error_Succeed)
|
|
|
{
|
|
|
rc = Error_DevConnFailed;
|
|
|
- Dbg("StopRecord SalesClient connected failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("StopRecord SalesClient connected failed!");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1445,10 +1445,10 @@ ErrorCodeEnum CITCtrlEntity::StopRecord(CSimpleStringA strVideoName)
|
|
|
req.VideoName = CSimpleStringA2W(strVideoName);
|
|
|
rc = m_pSalesRecordClient->StopRecord(req, ans, 5000);
|
|
|
if(Error_Succeed == rc){
|
|
|
- Dbg("Stop record %s success.", strVideoName.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop record %s success.", strVideoName.GetData());
|
|
|
}
|
|
|
else{
|
|
|
- Dbg("Stop record %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop record %s failed for 0x%08x",strVideoName.GetData(), rc);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1462,11 +1462,11 @@ eRecordDeviceState CITCtrlEntity::GetRecordDeviceState()
|
|
|
CSimpleStringA camstate;
|
|
|
GetFunction()->GetSysVar("CameraState",camstate);
|
|
|
if (0 == camstate.GetLength()){
|
|
|
- Dbg("GetSysVar CameraState failed.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetSysVar CameraState failed.");
|
|
|
return eState;
|
|
|
}
|
|
|
else{
|
|
|
- Dbg("GetSysVar CameraState is %s.",camstate.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetSysVar CameraState is %s.",camstate.GetData());
|
|
|
}
|
|
|
|
|
|
char cState = camstate[0];
|
|
@@ -1651,14 +1651,14 @@ void UIServiceSession::Handle_StartRecordVideo(SpReqAnsContext<UIService_StartRe
|
|
|
{
|
|
|
|
|
|
ErrorCodeEnum rc = Error_Succeed;
|
|
|
- Dbg("return ret rc is 0x%08x, Ans.ErrorCode is 0x%08x, and ErrorMsg is %s.", rc, ctx->Ans.ErrorCode, CSimpleStringW2A(ctx->Ans.ErrorMsg).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("return ret rc is 0x%08x, Ans.ErrorCode is 0x%08x, and ErrorMsg is %s.", rc, ctx->Ans.ErrorCode, CSimpleStringW2A(ctx->Ans.ErrorMsg).GetData());
|
|
|
ctx->Answer(rc);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_StopRecordVideo(SpReqAnsContext<UIService_StopRecordVideo_Req, UIService_StopRecordVideo_Ans>::Pointer ctx)
|
|
|
{
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STOPRECORD,(LPCTSTR)CSimpleStringW2A(ctx->Req.content));
|
|
|
- Dbg("Sales Recording flag is %d.", m_pEntity->m_bSalesRecording);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sales Recording flag is %d.", m_pEntity->m_bSalesRecording);
|
|
|
|
|
|
ErrorCodeEnum Error = Error_Succeed;
|
|
|
if (m_pEntity->m_bSalesRecording){
|
|
@@ -1680,14 +1680,14 @@ void UIServiceSession::Handle_StopRecordVideo(SpReqAnsContext<UIService_StopReco
|
|
|
|
|
|
void UIServiceSession::Handle_ShowVideo(SpReqAnsContext<UIService_ShowVideo_Req, UIService_ShowVideo_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("show video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("show video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ErrorCodeEnum Error = m_pEntity->PlayVideo(CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_SaveVideo(SpReqAnsContext<UIService_SaveVideo_Req, UIService_SaveVideo_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("save video,videoname=%s",CSimpleStringW2A(ctx->Req.VideoName).GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("save video,videoname=%s",CSimpleStringW2A(ctx->Req.VideoName).GetData());
|
|
|
ErrorCodeEnum Error = m_pEntity->SaveVideo(CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
@@ -1695,7 +1695,7 @@ void UIServiceSession::Handle_SaveVideo(SpReqAnsContext<UIService_SaveVideo_Req,
|
|
|
void UIServiceSession::Handle_DeleteVideo(SpReqAnsContext<UIService_DeleteVideo_Req, UIService_DeleteVideo_Ans>::Pointer ctx)
|
|
|
{
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_DELETEVIDEO,(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
- Dbg("delete video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("delete video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
|
|
|
@@ -1703,13 +1703,13 @@ void UIServiceSession::Handle_DeleteVideo(SpReqAnsContext<UIService_DeleteVideo_
|
|
|
void UIServiceSession::Handle_StartPhotograph(SpOnewayCallContext<UIService_StartPhotograph_Info>::Pointer ctx)
|
|
|
{
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STARTPHOTOGRAPH,"StartPhotograph");
|
|
|
- Dbg("Start Photograph.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start Photograph.");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_StopPhotograph(SpOnewayCallContext<UIService_StopPhotograph_Info>::Pointer ctx)
|
|
|
{
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STOPPHOTOGRAPH,"StopPhotograph");
|
|
|
- Dbg("Stop Photograph.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Photograph.");
|
|
|
}
|
|
|
|
|
|
// add by ly
|
|
@@ -1717,7 +1717,7 @@ void UIServiceSession::Handle_StartPlayVideo(SpReqAnsContext<UIService_StartPlay
|
|
|
{
|
|
|
#ifdef RVC_OS_WIN
|
|
|
ErrorCodeEnum Error = m_pEntity->StartPlayVideo(ctx->Req.CfgInx, ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight, 800);
|
|
|
- Dbg("Start Play Local Video!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start Play Local Video!");
|
|
|
ctx->Answer(Error);
|
|
|
#else
|
|
|
ctx->Answer(Error_Succeed);
|
|
@@ -1727,14 +1727,14 @@ void UIServiceSession::Handle_StartPlayVideo(SpReqAnsContext<UIService_StartPlay
|
|
|
void UIServiceSession::Handle_StartPlayAudio(SpReqAnsContext<UIService_StartPlayAudio_Req, UIService_StartPlayAudio_Ans>::Pointer ctx)
|
|
|
{
|
|
|
ErrorCodeEnum Error = m_pEntity->StartPlayAudio(ctx->Req.AudioNames, 800);
|
|
|
- Dbg("Start Play Local Audio!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start Play Local Audio!");
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_StartPlayImage(SpReqAnsContext<UIService_StartPlayImage_Req, UIService_StartPlayImage_Ans>::Pointer ctx)
|
|
|
{
|
|
|
ErrorCodeEnum Error = m_pEntity->StartPlayImage(ctx->Req.CfgInx, ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight, 800);
|
|
|
- Dbg("Start Play Local Image!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Start Play Local Image!");
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
|
|
|
@@ -1742,7 +1742,7 @@ void UIServiceSession::Handle_StopPlayVideo(SpReqAnsContext<UIService_StopPlayVi
|
|
|
{
|
|
|
#ifdef RVC_OS_WIN
|
|
|
ErrorCodeEnum Error = m_pEntity->StopPlayVideo(ctx->Req.CfgInx, 800);
|
|
|
- Dbg("Stop Play Local Video!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Play Local Video!");
|
|
|
ctx->Answer(Error);
|
|
|
#else
|
|
|
ctx->Answer(Error_Succeed);
|
|
@@ -1752,14 +1752,14 @@ void UIServiceSession::Handle_StopPlayVideo(SpReqAnsContext<UIService_StopPlayVi
|
|
|
void UIServiceSession::Handle_StopPlayAudio(SpReqAnsContext<UIService_StopPlayAudio_Req, UIService_StopPlayAudio_Ans>::Pointer ctx)
|
|
|
{
|
|
|
ErrorCodeEnum Error = m_pEntity->StopPlayAudio(800);
|
|
|
- Dbg("Stop Play Local Audio!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Play Local Audio!");
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_StopPlayImage(SpReqAnsContext<UIService_StopPlayImage_Req, UIService_StopPlayImage_Ans>::Pointer ctx)
|
|
|
{
|
|
|
ErrorCodeEnum Error = m_pEntity->StopPlayImage(ctx->Req.CfgInx, 800);
|
|
|
- Dbg("Stop Play Local Image!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Play Local Image!");
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
|
|
|
@@ -1768,7 +1768,7 @@ void UIServiceSession::Handle_SendOperateState(SpOnewayCallContext<UIService_Sen
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_SENDOPERATESTATE,"UI send operate state");
|
|
|
- Dbg("UI send operate state!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send operate state!");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_CheckContinuRecord( SpReqAnsContext<UIService_CheckContinuRecord_Req, UIService_CheckContinuRecord_Ans>::Pointer ctx )
|
|
@@ -1786,7 +1786,7 @@ void UIServiceSession::Handle_StartContinuRecord( SpReqAnsContext<UIService_Star
|
|
|
void UIServiceSession::Handle_StopContinuRecord( SpReqAnsContext<UIService_StopContinuRecord_Req, UIService_StopContinuRecord_Ans>::Pointer ctx )
|
|
|
{
|
|
|
CSimpleStringA videoname = (LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName);
|
|
|
- Dbg("stop continue record,videoname=%s",(LPCTSTR)videoname);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop continue record,videoname=%s",(LPCTSTR)videoname);
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STOP_CONTINURECORD,(LPCTSTR)videoname);
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
@@ -1804,89 +1804,89 @@ void UIServiceSession::Handle_HideOnlineVideo(SpOnewayCallContext<UIService_Hide
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_HIDEONLINEVIDEO,"UI send Hide online video");
|
|
|
- Dbg("UI send Hide online video");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send Hide online video");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_ShowOnlineVideo(SpOnewayCallContext<UIService_ShowOnlineVideo_Info>::Pointer ctx)
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_SHOWONLINEVIDEO,"UI send show online video");
|
|
|
- Dbg("UI send show online video");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send show online video");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_HideLocalVideo(SpOnewayCallContext<UIService_HideLocalVideo_Info>::Pointer ctx)
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_HIDELOCALVIDEO,"UI send Hide local video");
|
|
|
- Dbg("UI send Hide local video");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send Hide local video");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_ShowLocalVideo(SpOnewayCallContext<UIService_ShowLocalVideo_Info>::Pointer ctx)
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_SHOWLOCALVIDEO,"UI send show local video");
|
|
|
- Dbg("UI send show local video");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send show local video");
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_HidePersonArea(SpOnewayCallContext<UIService_HidePersonArea_Info>::Pointer ctx)
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_HIDEPERSONAREA,"UI send Hide Person area");
|
|
|
- Dbg("UI send Hide Person area");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send Hide Person area");
|
|
|
}
|
|
|
void UIServiceSession::Handle_ShowPersonArea(SpOnewayCallContext<UIService_ShowPersonArea_Info>::Pointer ctx)
|
|
|
{
|
|
|
/// override by user
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_SHOWPERSONAREA,"UI send show Person area");
|
|
|
- Dbg("UI send show Person area");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UI send show Person area");
|
|
|
}
|
|
|
|
|
|
|
|
|
void UIServiceSession::Handle_AnswerPacket(SpReqAnsContext<UIService_AnswerPacket_Req, UIService_AnswerPacket_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("Send Answer to Mobile,%s",ctx->Req.Packet);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Send Answer to Mobile,%s",ctx->Req.Packet);
|
|
|
m_pEntity->SendAnswertoMobile(ctx->Req.Packet);
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_GetLocalVideoVolume( SpReqAnsContext<UIService_GetLocalVideoVolume_Req, UIService_GetLocalVideoVolume_Ans>::Pointer ctx )
|
|
|
{
|
|
|
- Dbg("Get Local Video Volume with CfgInx:%d!", ctx->Req.CfgInx);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get Local Video Volume with CfgInx:%d!", ctx->Req.CfgInx);
|
|
|
ErrorCodeEnum error = m_pEntity->GetLocalVideoVolume(ctx->Req.CfgInx, ctx->Ans.Volume, 2000);
|
|
|
ctx->Answer(error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_SetLocalVideoVolume( SpReqAnsContext<UIService_SetLocalVideoVolume_Req, UIService_SetLocalVideoVolume_Ans>::Pointer ctx )
|
|
|
{
|
|
|
- Dbg("Set Local Video Volume with CfgInx:%d, Volume:%d!", ctx->Req.CfgInx, ctx->Req.Volume);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set Local Video Volume with CfgInx:%d, Volume:%d!", ctx->Req.CfgInx, ctx->Req.Volume);
|
|
|
ErrorCodeEnum error = m_pEntity->SetLocalVideoVolume(ctx->Req.CfgInx, ctx->Req.Volume, 2000);
|
|
|
ctx->Answer(error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_GetLocalAudioVolume(SpReqAnsContext<UIService_GetLocalAudioVolume_Req, UIService_GetLocalAudioVolume_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("Get Local Audio Volume");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get Local Audio Volume");
|
|
|
ErrorCodeEnum error = m_pEntity->GetLocalAudioVolume(ctx->Ans.Volume, 2000);
|
|
|
ctx->Answer(error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_SetLocalAudioVolume(SpReqAnsContext<UIService_SetLocalAudioVolume_Req, UIService_SetLocalAudioVolume_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("Set Local Audio Volume with Volume:%d!", ctx->Req.Volume);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set Local Audio Volume with Volume:%d!", ctx->Req.Volume);
|
|
|
ErrorCodeEnum error = m_pEntity->SetLocalAudioVolume(ctx->Req.Volume, 2000);
|
|
|
ctx->Answer(error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_SendBusinessDesktopCmd(SpReqAnsContext<UIService_SendBusinessDesktopCmd_Req, UIService_SendBusinessDesktopCmd_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("Handle_SendBusinessDesktopCmd : %s %s", ctx->Req.xapName, ctx->Req.command);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Handle_SendBusinessDesktopCmd : %s %s", ctx->Req.xapName, ctx->Req.command);
|
|
|
ErrorCodeEnum error = m_pEntity->SendBusinessDesktopCmd(ctx->Req.xapName, ctx->Req.command);
|
|
|
ctx->Answer(error);
|
|
|
}
|
|
|
|
|
|
void UIServiceSession::Handle_VideoAppendWaterMark(SpReqAnsContext<UIService_VideoAppendWaterMark_Req, UIService_VideoAppendWaterMark_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("Handle_VideoAppendWaterMark :video name is %s,append water mark is %s", (LPCTSTR)CSimpleStringW2A(ctx->Req.videoName), (LPCTSTR)CSimpleStringW2A(ctx->Req.appendstr));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Handle_VideoAppendWaterMark :video name is %s,append water mark is %s", (LPCTSTR)CSimpleStringW2A(ctx->Req.videoName), (LPCTSTR)CSimpleStringW2A(ctx->Req.appendstr));
|
|
|
CSimpleStringA strParam = CSimpleStringA::Format("%s|%s", (LPCTSTR)CSimpleStringW2A(ctx->Req.videoName), (LPCTSTR)CSimpleStringW2A(ctx->Req.appendstr));
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_VIDEOAPPENDWATERMARK,(LPCTSTR)strParam);
|
|
|
ctx->Answer(Error_Succeed);
|
|
@@ -1898,7 +1898,7 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
|
|
|
|
|
|
CSimpleStringA camstate;
|
|
|
m_pEntity->GetFunction()->GetSysVar("CameraState",camstate);
|
|
|
- Dbg("start remote record, camstate=%s.",(LPCTSTR)camstate);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start remote record, camstate=%s.",(LPCTSTR)camstate);
|
|
|
if (camstate[0] == 'N' || camstate[0] == 'O') {
|
|
|
rc = m_pEntity->StartRemoteRecord(m_pEntity->EncryptVideoNameCarNumber(CSimpleStringW2A(ctx->Req.VideoName)));
|
|
|
if (Error_Succeed == rc) {
|
|
@@ -1936,7 +1936,7 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
|
|
|
|
|
|
void UIServiceSession::Handle_StopRemoteRecord(SpReqAnsContext<UIService_StopRemoteRecord_Req, UIService_StopRemoteRecord_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("stop remote record.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop remote record.");
|
|
|
LogEvent(Severity_Middle,LOG_EVT_UI_STOPREMOTERECORD,(LPCTSTR)(m_pEntity->EncryptVideoNameCarNumber(CSimpleStringW2A(ctx->Req.content))));
|
|
|
m_pEntity->m_bSalesRecording = FALSE;
|
|
|
ErrorCodeEnum Error = m_pEntity->StopRecord(CSimpleStringW2A(ctx->Req.content));
|
|
@@ -1982,7 +1982,7 @@ void UIServiceSession::Handle_AjustVideoPreviewSize(SpReqAnsContext<UIService_Aj
|
|
|
pSipphoneClient->SafeDelete();
|
|
|
pSipphoneClient = NULL;
|
|
|
Error = Error_DevConnFailed;
|
|
|
- Dbg("Connect SipPhone entity failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Connect SipPhone entity failed!");
|
|
|
ctx->Ans.ErrorCode = Error_DevConnFailed;
|
|
|
ctx->Ans.ErrorMsg = CSimpleStringA2W("Connect SipPhone entity failed.");
|
|
|
}
|
|
@@ -1990,7 +1990,7 @@ void UIServiceSession::Handle_AjustVideoPreviewSize(SpReqAnsContext<UIService_Aj
|
|
|
char strvideoparam[MAX_PATH] = {0};
|
|
|
snprintf(strvideoparam, MAX_PATH, "%d@%d@%d@%d", ctx->Req.leftx, ctx->Req.lefty, ctx->Req.width, ctx->Req.height);
|
|
|
LogEvent(Severity_Middle, LOG_EVT_UI_ADJUSTVIDEOECHOSIZE, strvideoparam);
|
|
|
- Dbg("adjust video preview size, param is %s.", strvideoparam);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("adjust video preview size, param is %s.", strvideoparam);
|
|
|
ctx->Ans.ErrorCode = 0;
|
|
|
ctx->Ans.ErrorMsg = CSimpleStringA2W("");
|
|
|
}
|
|
@@ -2000,7 +2000,7 @@ void UIServiceSession::Handle_AjustVideoPreviewSize(SpReqAnsContext<UIService_Aj
|
|
|
|
|
|
void UIServiceSession::Handle_StopShowVideo(SpReqAnsContext<UIService_StopShowVideo_Req, UIService_StopShowVideo_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("stop show video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop show video,videoname=%s",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ErrorCodeEnum Error = m_pEntity->StopShowVideo(CSimpleStringW2A(ctx->Req.VideoName));
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
@@ -2008,7 +2008,7 @@ void UIServiceSession::Handle_StopShowVideo(SpReqAnsContext<UIService_StopShowVi
|
|
|
|
|
|
void UIServiceSession::Handle_StartPlaySalesRecord(SpReqAnsContext<UIService_StartPlaySalesRecord_Req, UIService_StartPlaySalesRecord_Ans>::Pointer ctx)
|
|
|
{
|
|
|
- Dbg("start play sales record, videoname=%s, WndX=%d, WndY=%d, WndWidth=%d, WndHeight=%d.",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName), ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start play sales record, videoname=%s, WndX=%d, WndY=%d, WndWidth=%d, WndHeight=%d.",(LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName), ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight);
|
|
|
ErrorCodeEnum Error = m_pEntity->StartPlaySalesRecordVideo(CSimpleStringW2A(ctx->Req.VideoName), ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight);
|
|
|
ctx->Answer(Error);
|
|
|
}
|
|
@@ -2061,7 +2061,7 @@ void UIServiceSession::Handle_StartPlayNotice(SpReqAnsContext<UIService_StartPla
|
|
|
req.WndHeight = ctx->Req.WndHeight;
|
|
|
req.VideoName = ctx->Req.VideoName;
|
|
|
Error = m_pEntity->GetLocalPlayClient()->StartPlayNotice(req, ans, 800);
|
|
|
- Dbg("StartPlayNotice Result = 0x%08x.", Error);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("StartPlayNotice Result = 0x%08x.", Error);
|
|
|
ctx->Ans.ErrorCode = Error;
|
|
|
}
|
|
|
|