!10680 去除升级，心跳实体对Runstate系统变量的依赖

Merge pull request !10680 from 80174520/feature_T25BT451_js

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -235,25 +235,6 @@ void CUpgradeMgrEntity::OnStarted()
 
 	}
 
-	if (pFunc->GetSysVar("RunState", strValue) == Error_Succeed && strValue.Compare("N") ==0)
-	{
-		// 已经进入终端启动成功状态
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("====framework is start up 1====");
-		m_bSystemStartUp =true;
-	}		
-	else
-	{
-		// 否则启动监控RunState
-		rc= pFunc->RegistSysVarEvent("RunState", this);
-		if (rc != Error_Succeed)
-		{
-			LogWarn(Severity_Middle, rc, ERR_WRAN_REGIST_SYS_VAR_FAIL, CSimpleStringA::Format("RegistSysVarEvent RunState  is fail,%d",(int)rc).GetData());
-			m_testResult=Error_InvalidState;//自检失败
-		}else{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent RunState succ");
-		}
-	}
-
 	GetFunction()->SubscribeLog(m_uuidHeartBeat, this, Log_Event, Severity_Middle, Error_IgnoreAll, -1, "HeartBeat", false);
 
 	//启动灰度控制判断，看启动什么状态机
@@ -291,14 +272,6 @@ void CUpgradeMgrEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,c
 			}
 		}
 	}
-	if(strcmp("RunState",pszKey)==0){
-		if(!m_bSystemStartUp){
-			if (strcmp(pszValue, "N") ==0){
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("====framework is start up 2====");
-				m_bSystemStartUp = true;				
-			}
-		}
-	}
 }
 
 void CUpgradeMgrEntity::OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nLogID, const LogTypeEnum eLogType, const SeverityLevelEnum eLevel, 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)

Module/mod_UpgradeMgr/mod_UpgradeMgr.h

@@ -28,7 +28,6 @@ public:
 		m_strSM3Hash="";
 		m_bStartUp=false;//首页是否进入
 		m_initSucc=false;//状态机是否启动成功
-		m_bSystemStartUp=false;//框架是否启动成功
 		m_testResult=Error_Succeed;//默认是成功的
 		m_iBlackFileSum=0;
 	}
@@ -79,7 +78,7 @@ public:
 	int m_IsSM3listSucc;//获取SM3哈希list是否成功，0：还未计算完毕，1：表示成功 ，-1表示计算失败
 	DWORD m_beginSM3HashTime;//开始计算sm3hahs时间
 	bool m_bStartUp;//是否系统首页启动成功
-	bool m_bSystemStartUp;//框架启动成功
+	//bool m_bSystemStartUp;//框架启动成功
 
 	CUpgradeTaskFSM m_taskFSM;
 	bool bNewUpgradeMgr;//是否启用新状态机（很重要的变量）

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -500,9 +500,9 @@ string CHeartBeatFSM::HandShakeJsonStr() {
 	//写入shakehandvo对象
 	CSystemStaticInfo sysSInfo;
 	m_pEntity->GetFunction()->GetSystemStaticInfo(sysSInfo);
-	CSimpleStringA warningLevel("w"), runState("r"), customerHandle("c"), callState("s"),
+	CSimpleStringA warningLevel("w"), runState("O"), customerHandle("c"), callState("s"),
 		localMaintain("l"), remoteMaintain("m"), termStage("U");
-	m_pEntity->GetFunction()->GetSysVar("RunState", runState);
+	//m_pEntity->GetFunction()->GetSysVar("RunState", runState);
 	m_pEntity->GetFunction()->GetSysVar("CustomerHandle", customerHandle);
 	m_pEntity->GetFunction()->GetSysVar("CallState", callState);
 	m_pEntity->GetFunction()->GetSysVar("TerminalStage", termStage);
@@ -1123,12 +1123,12 @@ void HeartBeatConnection::SendHandShake()
 
 	//Dbg("get sysvar");
 	//oiltest set default value
-	CSimpleStringA warningLevel("w"),runState("r"),customerHandle("c"),callState("s"),
+	CSimpleStringA warningLevel("w"),runState("O"),customerHandle("c"),callState("s"),
 		localMaintain("l"),remoteMaintain("m"),termStage("U");
 	//m_pEntity->GetFunction()->GetSysVar("WarningLevel",warningLevel);
 
 	strncpy(req.TerminalNo,m_TerminalNo.GetData(),m_TerminalNo.GetLength());
-	m_pEntity->GetFunction()->GetSysVar("RunState",runState);
+	//m_pEntity->GetFunction()->GetSysVar("RunState",runState);
 	m_pEntity->GetFunction()->GetSysVar("CustomerHandle",customerHandle);
 	m_pEntity->GetFunction()->GetSysVar("CallState",callState);
 	//m_pEntity->GetFunction()->GetSysVar("LocalMaintain",localMaintain);