!10788 事件转换实体系统变量注册逻辑优化

Merge pull request !10788 from 80274480/fixbug_base_ST2

Module/mod_evtconverter/mod_evtconverter.cpp

@@ -31,21 +31,11 @@ public:
 	}
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError)
 	{
-
-		if (m_nIslog){
-
-		}
 		m_eDeviceType = eStand2sType; 
 		m_nIslog = 1;
 		ErrorCodeEnum Error;
 		CSimpleStringA str;
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-		CSimpleStringA strConfigDir;
-		Error = spEntityFunction->GetPath("CFG", strConfigDir);
-		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("get etc directory failed!");
-            return Error;
-        }
 
 		m_eDeviceType = RvcGetDeviceType();
 	
@@ -66,7 +56,7 @@ public:
         }
 		Error = spConfigCenterSetting->ReadConfigValue(GetEntityName(), "IsLog", str);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load config failed, read Log.IsLog failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("load config failed, read Log.IsLog failed!");
 			return Error;
 		}
 		m_nIslog = atoi(str);
@@ -87,21 +77,21 @@ public:
 		cb.user_data = this;
 		int rc = evt_engine_create(&cb, &engine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("create engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 
 		if (num > 0) {
 			rc = evt_engine_load(engine, indexarr, num, slot_trigger_arr, sizeof(slot_trigger_arr)/sizeof(slot_trigger_elem_t));
 			if (rc != 0) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load config failed!");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("load config failed!");
 				return (ErrorCodeEnum)rc;
 			}
 		}
 
 		rc = evt_engine_start(engine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("start engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 
@@ -144,12 +134,12 @@ public:
 		int rc;
 		rc = evt_engine_stop(m_pEngine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("stop engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 		rc = evt_engine_unload(m_pEngine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unload engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("unload engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 		evt_engine_destroy(m_pEngine);
@@ -163,7 +153,7 @@ public:
 		if (m_pEngine) {
 			int rc = evt_engine_process_sysvar(m_pEngine, pszKey, pszValue, pszOldValue, pszEntityName);
 			if (rc != 0) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process sysvar failed! Error; %d, key=%s oldvalue=%s, value=%s", rc,pszKey, pszOldValue, pszValue);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA1301")("process sysvar failed! Error; %d, key=%s oldvalue=%s, value=%s", rc,pszKey, pszOldValue, pszValue);
 			}
 		}
 	}
@@ -203,7 +193,7 @@ private:
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
 		ErrorCodeEnum Error = spEntityFunction->SetTimer((DWORD)timer_id, pWarp, (DWORD)interval);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set timer %d failed!", timer_id);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("set timer %d failed!", timer_id);
 			delete pWarp;
 		} 
 		else {
@@ -226,7 +216,7 @@ private:
 		CUUID uuid;
 		ErrorCodeEnum Error = GetFunction()->SubscribeLog(uuid, this, eLogType, eSeverityLevel, eSysError, dwUserCode, szEntity, bIgnoreMessage);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe log failed! Error = %d", Error);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("subscribe log failed! Error = %d", Error);
 		} 
 		else {
 			*sub_id = (unsigned long long)uuid;
@@ -240,21 +230,44 @@ private:
 		if (Error == Error_Succeed) {
 		} 
 		else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscribe log failed! Error = %d", Error);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("unsubscribe log failed! Error = %d", Error);
 		}
 		return (int)Error;
 	}
 
 	int subscribe_sysevent()
 	{
-		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-		return (int)spEntityFunction->RegistSysVarEvent("*", this);
+		ErrorCodeEnum Error = GetFunction()->RegistSysVarEvent("CustomerBeing", this);
+		if (Error != Error_Succeed) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerBeing");
+		}
+
+		Error = GetFunction()->RegistSysVarEvent("CustomerHandle", this);
+		if (Error != Error_Succeed) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerHandle");
+		}
+
+		Error = GetFunction()->RegistSysVarEvent("CallState", this);
+		if (Error != Error_Succeed) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CallState");
+		}
+
+		Error = GetFunction()->RegistSysVarEvent("BackInitiative", this);
+		if (Error != Error_Succeed) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "BackInitiative");
+		}
+
+		return Error;
 	}
 
 	int unsubscribe_sysevent()
 	{
-		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-		return (int)spEntityFunction->UnregistSysVarEvent("*");
+		GetFunction()->UnregistSysVarEvent("CustomerBeing");
+		GetFunction()->UnregistSysVarEvent("CustomerHandle");
+		GetFunction()->UnregistSysVarEvent("CallState");
+		GetFunction()->UnregistSysVarEvent("BackInitiative");
+
+		return Error_Succeed;
 	}
 
 	int get_sysevent(const char *key, CSimpleStringA &strValue)

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -1692,7 +1692,7 @@ void CMediaControllerEntity::OnLog( const CAutoArray<CUUID> &SubIDs, const CUUID
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402208V3").setResultCode("RTA2810")("上摄像分辨率不符合要求");
 			}
 			else if(idevid == capture_get_video_device_id(conf.strVideoOpt)){
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402208V3").setResultCode("RTA2810")("下摄像分辨率不符合要求");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402208V3").setResultCode("RTA2811")("下摄像分辨率不符合要求");
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("no mathed device id.");