~chenluhua/Bond2.git

			@@ -54,6 +54,8 @@
			typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
			typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
			typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
			typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
			typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -64,6 +66,9 @@
			ONPREFETCHEDOUTJOB onPreFethedOutJob;
			ONPRESTOREDJOB onPreStoredJob;
			ONPROCESSSTATE onProcessStateChanged;
			ONMAPMISMATCH onMapMismatch;
			ONPORTSTATUSCHANGED onPortStatusChanged;

			} EquipmentListener;


			@@ -74,6 +79,8 @@
			virtual ~CEquipment();

			public:
			void SetEnable(BOOL bEnable);
			BOOL IsEnabled() const;
			virtual const char* getClassName() = 0;
			virtual void setListener(EquipmentListener listener);
			void setCcLink(CCCLinkIEControl* pCcLink);
			@@ -246,6 +253,7 @@
			void setProcessState(PROCESS_STATE state);

			protected:
			BOOL m_bEnable;
			EquipmentListener m_listener;
			int m_nID;
			std::string m_strName;