~chenluhua/Bond2.git

			@@ -5,6 +5,7 @@
			#include "ToolUnits.h"
			#include "CEqAlarmStep.h"
			#include "AlarmManager.h"
			#include "CGlassPool.h"


			CModel::CModel()
			@@ -28,6 +29,11 @@
			return m_pObservable;
			}

			SERVO::CMaster& CModel::getMaster()
			{
			return m_master;
			}

			void CModel::setWorkDir(const char* pszWorkDir)
			{
			m_strWorkDir = pszWorkDir;
			@@ -45,6 +51,9 @@
			CString strModeType = _T("Master");
			CString strSoftRev = _T("1.0.2");


			// CGlassPool
			m_glassPool.initPool();


			// Log
			@@ -94,6 +103,10 @@


			SERVO::MasterListener masterListener;
			masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
			LOGI("<CModel>Master state changed(%d)", (int)state);
			notify(RX_CODE_MASTER_STATE_CHANGED);
			};
			masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
			LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
			bAlive ? _T("ON") : _T("OFF"));
			@@ -182,6 +195,7 @@
			m_hsmsPassive.term();
			CLog::GetLog()->SetOnLogCallback(nullptr);
			m_master.term();
			m_glassPool.term();

			return 0;
			}