~chenluhua/Bond2.git

			@@ -10,6 +10,10 @@
			#include <string.h>


			const char ACK[2] = {0, 1};
			const char* ACK0 = &ACK[0];
			const char* ACK1 = &ACK[1];

			unsigned __stdcall CimWorkThreadFunction(LPVOID lpParam)
			{
			CHsmsPassive* pPassive = (CHsmsPassive*)lpParam;
			@@ -490,7 +494,7 @@
			ASSERT(pMessage);

			ISECS2Item* pItem = pMessage->getBody();
			pItem->addBinaryItem(BYTE(0), "COMMACK");
			pItem->addBinaryItem(ACK0, 1, "COMMACK");
			ISECS2Item* pList = pItem->addItem();
			pList->addItem(m_strEquipmentModelType.c_str(), "MDLN");
			pList->addItem(m_strSoftRev.c_str(), "SOFTREV");
			@@ -750,15 +754,15 @@
			}
			}
			bCheckData = TRUE;
			LOGI("EanbleDisableAlarm bEnable:%s", bEnable ? _T("YES") : _T("NO"));
			for (auto item : ids) {
			LOGI("ID:%u", item);
			if (m_listener.onEnableDisableEventReport != nullptr) {
			m_listener.onEnableDisableEventReport(this, bEnable, ids);
			}
			}


			MYREPLY:
			replyAck(2, 38, pRecv->getHeader()->systemBytes, BYTE(0), "ERACK");
			replyAck(2, 38, pRecv->getHeader()->systemBytes,
			bCheckData ? BYTE(0) : BYTE(1), "ERACK");
			return 0;
			}

			@@ -833,36 +837,9 @@
			if (!pItem->getSubItemU4(1, ALID)) goto MYREPLY;
			bCheckData = TRUE;
			LOGI("EanbleDisableAlarmReport ALED:0x%02x, ALID:%d", ALED[0], ALID);

			double d;
			float f;
			pItem->getSubItemF4(2, f);
			pItem->getSubItemF8(3, d);
			LOGI("EanbleDisableAlarmReport d:%lf, f:%f",
			d, f);
			/*
			unsigned long long n1;
			unsigned int n2;
			unsigned short n3;
			unsigned char n4;
			long long sn1;
			int sn2;
			short sn3;
			char sn4;
			pItem->getSubItemU8(2, n1);
			pItem->getSubItemU4(3, n2);
			pItem->getSubItemU2(4, n3);
			pItem->getSubItemU1(5, n4);
			pItem->getSubItemI8(6, sn1);
			pItem->getSubItemI4(7, sn2);
			pItem->getSubItemI2(8, sn3);
			pItem->getSubItemI1(9, sn4);

			LOGI("EanbleDisableAlarmReport n1:%llu, n2:%u, n3:%hu, n4:%hhu",
			n1, n2, n3, n4);
			LOGI("EanbleDisableAlarmReport sn1:%lld, sn2:%d, sn3:%hd, sn4:%hhd",
			sn1, sn2, sn3, sn4);
			*/
			if (m_listener.onEnableDisableAlarmReport != nullptr) {
			m_listener.onEnableDisableAlarmReport(this, ALED[0] != 0, ALID);
			}
			}


			@@ -935,6 +912,9 @@
			return ER_NOTSELECT;
			}

			char szALCD[1];
			szALCD[0] = ALCD & 0xff;

			Lock();
			CHsmsAction* pAction = new CHsmsAction(ACTION_ALARM_REPORT, TRUE, m_nActionTimeout);
			m_listAction.push_back(pAction);
			@@ -942,7 +922,7 @@
			HSMS_Create1Message(pMessage, m_nSessionId, 5 \| REPLY, 1, ++m_nSystemByte);
			ASSERT(pMessage);
			ISECS2Item* pItem = pMessage->getBody();
			pItem->addBinaryItem(BYTE(ALCD & 0xff), "ALCD");
			pItem->addBinaryItem(szALCD, 1, "ALCD");
			pItem->addU4Item(ALID, "ALID");
			pItem->addItem(ALTX, "ALTX");
			pAction->setSendMessage(pMessage);