From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图,目前灰色表示掉线,绿色表示在线。增加Slot的小点表示有没有料,及加工状态 。 2.增加图示

---
 SourceCode/Bond/Servo/CBonder.cpp |  398 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 351 insertions(+), 47 deletions(-)

diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 51c064b..4bccfbc 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
 #include "CBonder.h"
 
 
@@ -29,10 +29,10 @@
 		CEquipment::term();
 	}
 
-	// 必须要实现的虚函数,在此初始化Pin列表
+	// 蹇呴』瑕佸疄鐜扮殑铏氬嚱鏁帮紝鍦ㄦ鍒濆鍖朠in鍒楄〃
 	void CBonder::initPins()
 	{
-		// 加入Pin初始化代码
+		// 鍔犲叆Pin鍒濆鍖栦唬鐮�
 		LOGI("<CBonder>initPins");
 		addPin(SERVO::PinType::INPUT, _T("In1"));
 		addPin(SERVO::PinType::INPUT, _T("In2"));
@@ -137,8 +137,8 @@
 
 		{
 			// CIM Message Confirm
-			// 要将int32的值拆分为两个short, 分别为msg id和panel id
-			// 65538, 2为msg id, 1为panel id
+			// 瑕佸皢int32鐨勫�兼媶鍒嗕负涓や釜short, 鍒嗗埆涓簃sg id鍜宲anel id
+			// 65538, 2涓簃sg id, 1涓簆anel id
 			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, m_nIndex == 0 ? 0x9d80 : 0xdd80);
 			pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
 			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x349 : 0x649);
@@ -156,7 +156,6 @@
 				delete pStep;
 			}
 		}
-
 
 		{
 			CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
@@ -179,7 +178,7 @@
 		}
 
 		{
-			// 请求主配方列表的step
+			// 璇锋眰涓婚厤鏂瑰垪琛ㄧ殑step
 			CEqWriteStep* pStep = new CEqWriteStep();
 			pStep->setName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
 			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x366 : 0x666);
@@ -193,12 +192,13 @@
 			// master recipe list report
 			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xa955 : 0xe955, 255 * 2,
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+					short ret = MRLRC_OK;
 					if (code == ROK && pszData != nullptr && size > 0) {
-						// 此处解释配方数据
-						short ret = decodeRecipeListReport(pszData, size);
-						pStep->setReturnCode(ret);
+						// 姝ゅ瑙i噴閰嶆柟鏁版嵁
+						ret = decodeRecipeListReport(pszData, size);
 					}
-					pStep->setReturnCode(MRLRC_OK);
+					pTmpStep->setReturnCode(ret);
 					return -1;
 				});
 			pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
@@ -210,7 +210,7 @@
 		}
 
 		{
-			// 请求配方参数
+			// 璇锋眰閰嶆柟鍙傛暟
 			CEqWriteStep* pStep = new CEqWriteStep();
 			pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
 			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x367 : 0x667);
@@ -223,13 +223,14 @@
 		{
 			// recipe parameter report
 			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xaa54 : 0xea54, 257 * 2,
-				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+				[&, pStep](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+					short ret = MRLRC_OK;
 					if (code == ROK && pszData != nullptr && size > 0) {
-						// 此处解释配方数据
-						short ret = decodeRecipeParameterReport(pszData, size);
-						pStep->setReturnCode(ret);
+						// 姝ゅ瑙i噴閰嶆柟鏁版嵁
+						ret = decodeRecipeParameterReport(pszData, size);
 					}
-					pStep->setReturnCode(MRLRC_OK);
+					pTmpStep->setReturnCode(ret);
 					return -1;
 				});
 			pStep->setName(STEP_EQ_RECIPE_PARAMETER);
@@ -240,11 +241,11 @@
 			}
 		}
 
-		// 使用CEqReadStep替换CEqJobEventStep
+		// 浣跨敤CEqReadStep鏇挎崲CEqJobEventStep
 		{
 			// Received Job Report Upstream #1~9
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8c90 : 0xcc90) + 320 * i, 320 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -264,16 +265,17 @@
 				}
 			}
 		}
+
 		{
 			// Sent Out Job Report Downstream #1~9
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8000 : 0xc000) + 320 * i, 320 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
 							int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
 							if (port > 0) {
-								decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+								decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
 							}
 						}
 						return -1;
@@ -291,7 +293,7 @@
 		{
 			// Fetched Out Job Report #1~15
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x9c31 : 0xdc31) + 18 * i, 18 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -315,7 +317,7 @@
 		{
 			// Stored Job Report #1~15
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x9b23 : 0xdb23) + 18 * i, 18 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -337,28 +339,26 @@
 		}
 
 		{
-			// Panel Data Report
-			CEqReadStep* pStep = new CEqReadStep(0xA17f, 386 * 2,
-				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
-					if (code == ROK && pszData != nullptr && size > 0) {
-						decodePanelDataReport((CStep*)pFrom, pszData, size);
-					}
-					return -1;
-				});
-			pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
-			pStep->setProp("Port", (void*)1);
-			pStep->setWriteSignalDev(0x45e);
-			if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
+			// Indexer Operation Mode Change
+			CEqWriteStep* pStep = new CEqWriteStep();
+			pStep->setName(STEP_EQ_IN_OP_MODE_CHANGE);
+			pStep->setWriteSignalDev(0x370);
+			pStep->setDataDev(0x923);
+			pStep->setRetDataDev(0xa00e, 2);
+			if (addStep(STEP_ID_IN_OP_CMD_REPLY, pStep) != 0) {
 				delete pStep;
 			}
 		}
 
+		// FAC Data Report
+		addFacDataReportStep(m_nIndex == 0 ? 0xA589 : 0xE589,
+			m_nIndex == 0 ? 0x34d : 0x64d, 1);
+		/*
 		{
-			// FAC Data Report
-			CEqReadStep* pStep = new CEqReadStep(0xA60E, 108 * 2,
+			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xA589 : 0xE589, 133 * 2,
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
-						decodePanelDataReport((CStep*)pFrom, pszData, size);
+						decodeFacDataReport((CStep*)pFrom, pszData, size);
 					}
 					return -1;
 				});
@@ -369,26 +369,75 @@
 				delete pStep;
 			}
 		}
+		*/
+
+		// process start/end report
+		{
+			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0x9D3F : 0xDD3F, 13 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeJobProcessStartReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_JOB_PROCESS_START_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x333 : 0x633);
+			if (addStep(STEP_ID_JOB_PROCESS_START_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0x9D4C : 0xDD4C, 13 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeJobProcessEndReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_JOB_PROCESS_END_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x334 : 0x634);
+			if (addStep(STEP_ID_JOB_PROCESS_END_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
 	}
 
-	// 必须要实现的虚函数,在此初始化Slot信息
+	// 蹇呴』瑕佸疄鐜扮殑铏氬嚱鏁帮紝鍦ㄦ鍒濆鍖朣lot淇℃伅
 	void CBonder::initSlots()
 	{
 		m_slot[0].enable();
 		m_slot[0].setPosition(m_nID);
 		m_slot[0].setNo(1);
 		m_slot[0].setName("Slot 1(G2)");
+		m_slot[0].setLinkSignalPath(0);
 		m_slot[0].setType(MaterialsType::G2);
 		m_slot[1].enable();
 		m_slot[1].setPosition(m_nID);
 		m_slot[1].setNo(2);
 		m_slot[1].setName("Slot 2(G1)");
+		m_slot[1].setLinkSignalPath(1);
 		m_slot[1].setType(MaterialsType::G1);
 	}
 
 	void CBonder::onTimer(UINT nTimerid)
 	{
 		CEquipment::onTimer(nTimerid);
+
+		// test	 
+		/*
+		static int i[2] = { 0, 0 };
+		i[m_nIndex]++;
+		if (m_nIndex == 0 && i[m_nIndex] % 20 == 0) {
+			if (m_listener.onAlarm != nullptr) {
+				m_listener.onAlarm(this, 1,
+					i[m_nIndex],
+					getID(),
+					1);
+			}
+		}
+		*/
 	}
 
 	void CBonder::serialize(CArchive& ar)
@@ -416,12 +465,18 @@
 		return m_nIndex;
 	}
 
-	BOOL CBonder::hasBondClass()
+	BOOL CBonder::hasBondGlass()
 	{
 		CGlass* pGlass = (CGlass*)m_slot[1].getContext();
 		if (pGlass == nullptr) return FALSE;
 		CGlass* pBuddy = pGlass->getBuddy();
 		return pBuddy != nullptr;
+	}
+
+	BOOL CBonder::hasG2Glass()
+	{
+		CGlass* pGlass = (CGlass*)m_slot[0].getContext();
+		return (pGlass != nullptr);
 	}
 
 	int CBonder::onProcessData(CProcessData* pProcessData)
@@ -432,35 +487,35 @@
 		return 0;
 	}
 
-	int CBonder::onProcessStateChanged(PROCESS_STATE state)
+	int CBonder::onProcessStateChanged(int slotNo, PROCESS_STATE prevState, PROCESS_STATE state)
 	{
-		CEquipment::onProcessStateChanged(state);
+		CEquipment::onProcessStateChanged(slotNo, prevState, state);
 
 		if (state == PROCESS_STATE::Complete) {
-			// 检查数据,当前两片玻璃,一片为G1, 一片为G2, 且pProcessData中的id能匹配G1或G2
+			// 妫�鏌ユ暟鎹紝褰撳墠涓ょ墖鐜荤拑锛屼竴鐗囦负G1, 涓�鐗囦负G2, 涓攑ProcessData涓殑id鑳藉尮閰岹1鎴朑2
 			Lock();
 			CGlass* pGlass2 = getGlassFromSlot(1);
 			CGlass* pGlass1 = getGlassFromSlot(2);
 			if (pGlass1 == nullptr || pGlass2 == nullptr) {
-				LOGE("<CBonder-%s>onProcessData,错误!不满足两片玻璃且分别为G1与G2的条件,请检查数据是否正确!", m_strName.c_str());
+				LOGE("<CBonder-%s>onProcessData,閿欒!涓嶆弧瓒充袱鐗囩幓鐠冧笖鍒嗗埆涓篏1涓嶨2鐨勬潯浠讹紝璇锋鏌ユ暟鎹槸鍚︽纭�!", m_strName.c_str());
 				Unlock();
 				return -1;
 			}
 			if (pGlass1->getBuddy() != nullptr) {
-				LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定,请检查数据是否正确!", m_strName.c_str());
+				LOGE("<CBonder-%s>onProcessData,閿欒!鐜荤拑杈冩棭鍓嶅凡琚粦瀹氾紝璇锋鏌ユ暟鎹槸鍚︽纭�!", m_strName.c_str());
 				Unlock();
 				return -1;
 			}
 
 			if (pGlass1->getType() != MaterialsType::G1 || pGlass2->getType() != MaterialsType::G2) {
-				LOGE("<CBonder-%s>onProcessData,错误!两片玻璃未匹配,必须分别为G1和G2类型,请检查数据是否正确!", m_strName.c_str());
+				LOGE("<CBonder-%s>onProcessData,閿欒!涓ょ墖鐜荤拑鏈尮閰嶏紝蹇呴』鍒嗗埆涓篏1鍜孏2绫诲瀷锛岃妫�鏌ユ暟鎹槸鍚︽纭�!", m_strName.c_str());
 				Unlock();
 				return -1;
 			}
 
 			pGlass1->setBuddy(pGlass2);
 			getSlot(0)->setContext(nullptr);
-			LOGE("<CBonder-%s>onProcessStateChanged,%s和%s已贴合!", m_strName.c_str(),
+			LOGE("<CBonder-%s>onProcessStateChanged,%s鍜�%s宸茶创鍚�!", m_strName.c_str(),
 				pGlass1->getID().c_str(), pGlass2->getID().c_str());
 			Unlock();
 		}
@@ -472,4 +527,253 @@
 	{
 		return m_nIndex == 0 ? 15000 : 20000;
 	}
+
+	int CBonder::parsingParams(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		ASSERT(pszData);
+		if (size < 250) return 0;
+		int i = 0, v;
+
+
+		// 1.鏍℃瀵逛綅寤舵椂
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鏍℃瀵逛綅寤舵椂", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 2.淇濆帇鏃堕棿
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("淇濆帇鏃堕棿", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 3.鑵斾綋鐮寸湡绌哄欢鏃�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鑵斾綋鐮寸湡绌哄欢鏃�", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 4.鑵斾綋鍒嗗瓙娉靛惎鍔ㄥ欢鏃�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鑵斾綋鍒嗗瓙娉靛惎鍔ㄥ欢鏃�", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 5.鑵斾綋璐撮檮鎶界湡绌哄欢鏃�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鑵斾綋璐撮檮鎶界湡绌哄欢鏃�", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 6.鍔犵儹绛夊緟寤舵椂
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鍔犵儹绛夊緟寤舵椂", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 7.姘斿泭鍘嬪姏璁惧畾
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("姘斿泭鍘嬪姏璁惧畾", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 8.姘斿泭鍔犲帇閫熺巼
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("姘斿泭鍔犲帇閫熺巼", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 9.姘斿泭娉勫帇閫熺巼
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("姘斿泭娉勫帇閫熺巼", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 10.璐撮檮鍘嬪姏涓婇檺
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("璐撮檮鍘嬪姏涓婇檺", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 11.Z杞磋浆鐭╅�熷害璁惧畾
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰Z杞磋浆鐭╅�熷害璁惧畾", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 12.涓婅厰娓╁害璁惧畾
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害璁惧畾", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 13.涓嬭厰娓╁害璁惧畾
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害璁惧畾", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 14.涓婅厰Z杞撮璐村悎浣嶉�熷害
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰Z杞撮璐村悎浣嶉�熷害", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 15.涓婅厰Z杞磋创闄勪綅閫熷害
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰Z杞磋创闄勪綅閫熷害", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 16.涓婅厰Z涓婅厰鍔犵儹浣嶉棿璺�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰Z涓婅厰鍔犵儹浣嶉棿璺�", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 17.涓婅厰璐撮檮浣嶅帇鍏ラ噺
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰璐撮檮浣嶅帇鍏ラ噺", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 18.涓婅厰Z杞寸牬鐪熺┖璺濈
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓婅厰Z杞寸牬鐪熺┖璺濈", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 19.涓嬮《Pin鐮寸湡绌鸿窛绂�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓嬮《Pin鐮寸湡绌鸿窛绂�", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 20.涓嬮《Pin鍔犵儹浣嶉棿璺�
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("涓嬮《Pin鍔犵儹浣嶉棿璺�", "", this->getName().c_str(), v * 0.001f));
+		i += 4;
+
+		// 21.鑵斾綋鐪熺┖娉电湡绌鸿璁惧畾鍊�
+		params.push_back(CParam("鑵斾綋鐪熺┖娉电湡绌鸿璁惧畾鍊�", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 22.鑵斾綋鍒嗗瓙娉靛埌杈捐瀹氬��
+		params.push_back(CParam("鑵斾綋鍒嗗瓙娉靛埌杈捐瀹氬��", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+
+		return (int)params.size();
+	}
+
+	int CBonder::parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		return parsingParams(pszData, size, params);
+	}
+
+	int CBonder::parsingSVData(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		/*
+		1	宸ヨ壓杩愯姝ラ	1Word	123456
+			2	姘斿泭鍘嬪姏褰撳墠	2Word	12345.6
+			3	涓婅厰鍘嬪姏鍚堣	1Word	1234.56
+			4	绠¢亾鐪熺┖瑙勫��	FLOAT	123.456
+			5	鑵斾綋鐪熺┖瑙勫��	FLOAT	123.456
+			6	涓婅厰娓╁害1	1Word	12345.6
+			7	涓婅厰娓╁害2	1Word	12345.6
+			8	涓婅厰娓╁害3	1Word	12345.6
+			9	涓婅厰娓╁害4	1Word	12345.6
+			10	涓婅厰娓╁害5	1Word	12345.6
+			11	涓婅厰娓╁害6	1Word	12345.6
+			12	涓嬭厰娓╁害1	1Word	12345.6
+			13	涓嬭厰娓╁害2	1Word	12345.6
+			14	涓嬭厰娓╁害3	1Word	12345.6
+			15	涓嬭厰娓╁害4	1Word	12345.6
+			16	涓嬭厰娓╁害5	1Word	12345.6
+			17	涓嬭厰娓╁害6	1Word	12345.6
+			18	鍘嬪悎鍓╀綑鏃堕棿	1Word	1234.56
+*/
+
+		ASSERT(pszData);
+		if (size < 125) return 0;
+		int i = 0, v;
+
+
+		// 1.宸ヨ壓杩愯姝ラ
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("宸ヨ壓杩愯姝ラ", "", this->getName().c_str(), v));
+		i += 2;
+
+		// 2.姘斿泭鍘嬪姏褰撳墠
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("姘斿泭鍘嬪姏褰撳墠", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 3.涓婅厰鍘嬪姏鍚堣
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰鍘嬪姏鍚堣", "", this->getName().c_str(), ((short)v) * 0.01f));
+		i += 2;
+
+		// 4.绠¢亾鐪熺┖瑙勫��
+		params.push_back(CParam("绠¢亾鐪熺┖瑙勫��", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 5.鑵斾綋鐪熺┖瑙勫��
+		params.push_back(CParam("鑵斾綋鐪熺┖瑙勫��", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 6.涓婅厰娓╁害1
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害1", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 7.涓婅厰娓╁害2
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害2", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 8.涓婅厰娓╁害3
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害3", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 9.涓婅厰娓╁害4
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害4", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 10.涓婅厰娓╁害5
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害5", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 11.涓婅厰娓╁害6
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓婅厰娓╁害6", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 12.涓嬭厰娓╁害1
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害1", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 13.涓嬭厰娓╁害2
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害2", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 14.涓嬭厰娓╁害3
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害3", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 15.涓嬭厰娓╁害4
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害4", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 16.涓嬭厰娓╁害5
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害5", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 17.涓嬭厰娓╁害6
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("涓嬭厰娓╁害6", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 18.鍔犵儹鍓╀綑鏃堕棿
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鍔犵儹鍓╀綑鏃堕棿", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 19.鍘嬪悎鍓╀綑鏃堕棿
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("鍘嬪悎鍓╀綑鏃堕棿", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		return (int)params.size();
+	}
+
 }

--
Gitblit v1.9.3