~chenluhua/Bond2.git

			@@ -52,6 +52,18 @@
			}
			}

			void CModel::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
			{
			m_master.setPortCassetteType(index, type);
			m_configuration.setPortCassetteType(index, (int)type);
			}

			void CModel::setPortEnable(unsigned int index, BOOL bEnable)
			{
			m_master.setPortEnable(index, bEnable);
			m_configuration.setPortEnable(index, bEnable);
			}

			int CModel::init()
			{
			CString strIniFile;
			@@ -136,7 +148,9 @@
			m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
			strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			m_hsmsPassive.loadCollectionEvents((LPTSTR)(LPCTSTR)strVarialbleFile);
			m_hsmsPassive.init(this, "APP", 7000);
			strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			m_hsmsPassive.loadCacheFromFile(strVarialbleFile);


			SERVO::MasterListener masterListener;
			masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
			@@ -299,6 +313,10 @@
			notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);

			};
			masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
			LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
			notifyPtr(RX_CODE_LOADPORT_STATUS_CHANGED, pEquipment);
			};
			m_master.setListener(masterListener);


			@@ -306,7 +324,7 @@
			CString strMasterDataFile;
			strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
			m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);

			m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());

			// 加载警告信息
			AlarmManager& alarmManager = AlarmManager::getInstance();
			@@ -321,6 +339,7 @@

			int CModel::term()
			{
			m_hsmsPassive.saveCache();
			m_hsmsPassive.term();
			CLog::GetLog()->SetOnLogCallback(nullptr);
			m_master.term();