~chenluhua/Bond2.git

			@@ -19,6 +19,8 @@
			#include "../DAQBridge/core/Collector.h"
			#include "CJobDataS.h"

			class CModel;


			#define CTStep_Unknow 0
			#define CTStep_LoadPort_Aligner 1
			@@ -50,6 +52,11 @@
			STOPPING,
			MSERROR,
			ATHERERROR
			};

			enum class CurveMode {
			Production = 0,
			EmptyChamber
			};

			typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
			@@ -99,6 +106,7 @@


			public:
			void setModelCtx(CModel* pModel);
			void setListener(MasterListener listener);
			CRobotTask* getActiveRobotTask();
			int init();
			@@ -110,6 +118,8 @@
			void clearError();
			ULONGLONG getRunTime();
			MASTERSTATE getState();
			void setCurveMode(CurveMode mode);
			CurveMode getCurveMode() const;
			unsigned DispatchProc();
			unsigned ReadBitsProc();
			void onTimer(UINT nTimerid);
			@@ -192,6 +202,13 @@
			bool ceidDefined(uint32_t ceid) const override;
			void setAllowedCeids(const std::vector<unsigned int>& ceids);
			void handleCollectionEvent(uint32_t ceid);
			bool raiseSoftAlarm(int alarmId,
			const std::string& desc,
			int level = -1,
			int deviceId = 0,
			int unitId = 0,
			const char* deviceName = "Software",
			const char* unitName = "App");

			public:
			int getLastError();
			@@ -244,6 +261,7 @@
			ULONGLONG m_ullStartTime;
			ULONGLONG m_ullRunTime;
			MASTERSTATE m_state;
			CurveMode m_curveMode;

			// 当前任务和已完成任务列表
			CRobotTask* m_pActiveRobotTask;
			@@ -273,9 +291,11 @@
			private:
			bool m_bEnableEventReport;
			bool m_bEnableAlarmReport;
			bool m_bPauseAlarmRaised;
			SERVO::CControlJob* m_pControlJob;
			std::vector<SERVO::CProcessJob*> m_processJobs;
			std::string m_strStatePath;
			CModel* m_pModelCtx;

			int m_nTestFlag;
			std::list<CGlass*> m_bufGlass;
			@@ -284,5 +304,10 @@
			private:
			Collector* m_pCollector = nullptr;
			void CreateDAQBridgeServer();
			inline void notifyControlJobChanged() {
			if (m_listener.onControlJobChanged) {
			m_listener.onControlJobChanged(this);
			}
			}
			};
			}