NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

成功收到登录消息不等于上线 

设备信息需要带上dv开头
This commit is contained in:
WangQiang 2016-09-18 09:36:42 +00:00
parent 43a02c1b7c
commit 08d1477f61
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TinyNet/TinyServer.cpp
View File

@ -117,7 +117,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl)
{ {
if (!OnJoin(msg)) return; if (!OnJoin(msg)) return;
dv = Current; dv = Current;
pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); // pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); 成功收到登录消息不等于上线
return; return;
} }
@ -132,6 +132,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl)
// 设置当前设备 // 设置当前设备
Current = dv; Current = dv;
OnPing(msg); OnPing(msg);
pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); // 成功收到Ping才等于上线
break; break;
case 5: case 5:
case 0x15: case 0x15:

6
TokenNet/DevicesManagement.cpp
View File

@ -491,7 +491,11 @@ bool DevicesManagement::SendDevices(DeviceAtions act, const Device* dv)
BinaryPair bp(datams); BinaryPair bp(datams);
GetDevInfo((Device*)dv, 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; return true;
} }