~chenluhua/Bond2.git

			@@ -43,6 +43,7 @@
			#define SIGNAL_UPSTREAM_TROUBLE 1
			#define SIGNAL_INTERLOCK 2
			#define SIGNAL_SEND_ABLE 3
			typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET;

			typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
			typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
			@@ -140,7 +141,7 @@
			int clearCimMessage(short id, short nTouchPanelNo);
			int setDateTime(short year, short month, short day, short hour, short minute, short second);
			int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr);
			int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock = nullptr);
			int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock);



			@@ -222,13 +223,8 @@
			int decodeVCREventReport(CStep* pStep, const char* pszData, size_t size);
			int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size);
			int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size);
			int addJobDataB(CJobDataB* pJobDataB);
			int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
			CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
			int addJobDataS(CJobDataS* pJobDataS);
			int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
			CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
			BOOL compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2);
			int decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size);
			BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
			void setProcessState(PROCESS_STATE state);

			protected:
			@@ -265,8 +261,6 @@

			private:
			CEquipment* m_pArm;
			std::list<CJobDataS> m_listJobDataS;
			std::list<CJobDataB> m_listJobDataB;
			};
			}