~chenluhua/Bond2.git

			@@ -3,10 +3,11 @@
			#include "CEqProcessStep.h"
			#include "Log.h"
			#include "ToolUnits.h"
			#include "CEquipment.h"


			namespace SERVO {
			CEqProcessStep::CEqProcessStep()
			CEqProcessStep::CEqProcessStep() : CReadStep()
			{
			m_nProcessDev = 0;
			m_nTotalParameter = 0;
			@@ -19,7 +20,7 @@

			void CEqProcessStep::getAttributeVector(CAttributeVector& attrubutes)
			{
			CStep::getAttributeVector(attrubutes);
			CReadStep::getAttributeVector(attrubutes);

			attrubutes.addAttribute(new CAttribute("Glass ID",
			m_strGlassId.c_str(), ""));
			@@ -46,7 +47,7 @@
			#define PROGRESS_BUF_SIZE (1024 + 64)
			int CEqProcessStep::onReadData()
			{
			CStep::onReadData();
			CReadStep::onReadData();

			// W1864 ~ W1A74, 529个word, 1058 bytes
			char szBuffer[PROGRESS_BUF_SIZE];
			@@ -59,7 +60,7 @@
			// 解释数据
			// Glass ID(1864~186D)
			int index = 0;
			convertString(&szBuffer[index], (0x186d - 0x1864 + 1) * 2, m_strStartTime);
			convertString(&szBuffer[index], (0x186d - 0x1864 + 1) * 2, m_strGlassId);
			index += (0x186d - 0x1864 + 1) * 2;

			// Process Start Time(186e~1875)
			@@ -94,8 +95,9 @@
			index += 20;
			}

			if (m_nCurrentGroup == m_nTotalGroup && m_listener.onEvent != nullptr) {
			m_listener.onEvent(this, STEP_EVENT_PROCESS_DATA, nullptr);
			if (m_nCurrentGroup == m_nTotalGroup) {
			ASSERT(m_pEquipment);
			m_pEquipment->onStepEvent(this, STEP_EVENT_PROCESS_DATA);
			}


			@@ -107,7 +109,7 @@

			int CEqProcessStep::onComplete()
			{
			CStep::onComplete();
			CReadStep::onComplete();
			LOGI("<CEqProcessStep> onComplete.");

			return 0;
			@@ -115,7 +117,7 @@

			int CEqProcessStep::onTimeout()
			{
			CStep::onTimeout();
			CReadStep::onTimeout();
			LOGI("<CEqProcessStep> onTimeout.");

			return 0;