From 08d1477f61133254427b56113ff8c3e45fb2f91f Mon Sep 17 00:00:00 2001
From: WangQiang <807319473@qq.com>
Date: Sun, 18 Sep 2016 09:36:42 +0000
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=94=B6=E5=88=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=B6=88=E6=81=AF=E4=B8=8D=E7=AD=89=E4=BA=8E=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=B8=A6=E4=B8=8Adv=E5=BC=80=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TinyNet/TinyServer.cpp         | 3 ++-
 TokenNet/DevicesManagement.cpp | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/TinyNet/TinyServer.cpp b/TinyNet/TinyServer.cpp
index 0d97fb40..842bd6e3 100644
--- a/TinyNet/TinyServer.cpp
+++ b/TinyNet/TinyServer.cpp
@@ -117,7 +117,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl)
 		{
 			if (!OnJoin(msg)) return;
 			dv = Current;
-			pDevMgmt->DeviceRequest(DeviceAtions::Online, dv);
+			// pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); 成功收到登录消息不等于上线
 			return;
 		}
 
@@ -132,6 +132,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl)
 			// 设置当前设备
 			Current = dv;
 			OnPing(msg);
+			pDevMgmt->DeviceRequest(DeviceAtions::Online, dv);  // 成功收到Ping才等于上线
 			break;
 		case 5:
 		case 0x15:
diff --git a/TokenNet/DevicesManagement.cpp b/TokenNet/DevicesManagement.cpp
index 286dbb8f..7dac6c3b 100644
--- a/TokenNet/DevicesManagement.cpp
+++ b/TokenNet/DevicesManagement.cpp
@@ -491,7 +491,11 @@ bool DevicesManagement::SendDevices(DeviceAtions act, const Device* dv)
 	BinaryPair bp(datams);
 	GetDevInfo((Device*)dv, datams);
 
-	if (Port)Port->Invoke(actstr, Buffer(datams.GetBuffer(), datams.Position()));
+	MemoryStream ms;
+	BinaryPair bp2(ms);
+	bp2.Set("dv", Buffer(datams.GetBuffer(), datams.Position()));
+
+	if (Port)Port->Invoke(actstr, Buffer(ms.GetBuffer(), ms.Position()));
 	return true;
 }