Z991239-6378 #comment 去掉VtmLoader的对TerminalState的测试代码

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1801,12 +1801,6 @@ bool CVtmLoaderFSM::GetConfig()
 	ITimerListener* pListener = new TimerOutHelper<CVtmLoaderFSM>(this, &CVtmLoaderFSM::OnCentersettingUpdateTimeout, pTmpData);
 	GetEntityBase()->GetFunction()->SetTimer(TIMER_CENTERSETTING_UPDATE_CHECK, pListener, CENTERSETTING_UPDATE_CHECK_TIME);
 
-	eErr = SubscribeEntitysEvents();
-	if (eErr != Error_Succeed)
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe event fail, 0x%x", eErr);
-	else
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe event succeed");
-
 	CSmartPointer<IConfigInfo> pConfig;
 	CSimpleString t_endpoint, t_topicSys, t_topicUser, t_topicBeidou, t_bussSys, t_bussUser, t_VTMWeb;
 
@@ -1867,20 +1861,7 @@ bool CVtmLoaderFSM::GetConfig()
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040210F13")("Get config succeed.");
 	return true;
 }
-ErrorCodeEnum CVtmLoaderFSM::SubscribeEntitysEvents()
-{
-	//want to do what?
-	auto rc = Error_Succeed;
-	/*GifutTest20250314 begin*/
-	CSmartPointer<IEntityFunction> pFunc = GetEntityBase()->GetFunction();
-	rc = pFunc->RegistTerminalStateChangeEvent(dynamic_cast<ITerminalStateChangedListener*>(this->GetEntityBase()));
-	if (rc != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("RegistTerminalStateChangeEvent failed: %s", SpStrError(rc));
-	}
-	/*GifutTest20250314 end*/
-	return rc;
-}
+
 int CVtmLoaderFSM::HttpConnCheck(CSimpleStringA csHttAddr, HttpAddrType eType)
 {
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to HttpConnCheck");

Module/mod_vtmloader/VtmLoaderFSM.h

@@ -203,7 +203,6 @@ private:
 	ErrorCodeEnum AsyncStartEntity(const char* entity_name, const char* cmdline, void* pData);
 	void OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp);
 	bool IsRootINIExist(CSimpleStringA& path);
-	ErrorCodeEnum SubscribeEntitysEvents();
 	CSimpleStringA GetDns();
 	void ToCheckIfInstalling();
 	void DoSpecialJobInTestRoom();

Module/mod_vtmloader/mod_vtmloader.cpp

@@ -54,7 +54,6 @@ void CVtmLoaderEntity::OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer
 { 
 	//m_task.Close();
 	m_FSM.PostExitEvent();
-	UnsubscribeEntitysEvents();
 	pTransactionContext->SendAnswer(Error_Succeed); 
 }	
 
@@ -144,18 +143,6 @@ void CVtmLoaderEntity::EntityLostProc(CSimpleStringA entityName)
 	else
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("on lost start %d", eErrCode);
 }
-	ErrorCodeEnum CVtmLoaderEntity::UnsubscribeEntitysEvents()
-{
-	auto pFunc = GetFunction();
-		
-	if ((__int64)m_SubLogID2 != 0)
-		pFunc->UnsubscribeLog(m_SubLogID2);
-
-	if ((__int64)m_SubLogID3 != 0)
-		pFunc->UnsubscribeLog(m_SubLogID3);
-
-	return Error_Succeed;
-}
 
 	void CVtmLoaderEntity::DealWithOldEvent(SpReqAnsContext<VtmLoaderService_DealWithOldEvent_Req, VtmLoaderService_DealWithOldEvent_Ans>::Pointer ctx)
 	{

Module/mod_vtmloader/mod_vtmloader.h

@@ -57,7 +57,6 @@ public:
 		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);
 
-	ErrorCodeEnum UnsubscribeEntitysEvents();
 	CSimpleStringA GetCurMaintainer(){ return m_strUserID;}
 
 	void SetTerminalNo(SpReqAnsContext<VtmLoaderService_SetTerminalNo_Req, VtmLoaderService_SetTerminalNo_Ans>::Pointer ctx) {	m_FSM.SetTerminalNo(ctx); 	}
@@ -95,14 +94,6 @@ public:
 	void EntityLostProc(CSimpleStringA entityName);
 	void SetVideoEntityOK() { m_FSM.SetVideoEntityOK(); }
 
-	/*GifutTest20250314 begin*/
-	//void OnStateChanged(AppBootStateEnum oldState, AppBootStateEnum curState, const char* triggerEntity)
-	//{
-	//	LOG_FUNCTION();
-	//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("state changed from %s to %s by %s", SpStrAppBootState(oldState), SpStrAppBootState(curState), triggerEntity);
-	//}
-	/*GifutTest20250314 end*/
-
 protected:
 	//GUITask m_task;
 	CVtmLoaderFSM m_FSM;