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

组网版本不是系统版本，而是为了做新旧版本组网消息兼容的版本号

This commit is contained in:
Stone 2015-12-29 04:53:31 +00:00
parent 5aba71562b
commit acce2327e7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TinyNet/TinyClient.cpp
View File

@ -308,7 +308,8 @@ void TinyClient::Join()
// 发送的广播消息，设备类型和系统ID // 发送的广播消息，设备类型和系统ID
JoinMessage dm; JoinMessage dm;
dm.Version = Sys.Version; // 组网版本不是系统版本，而是为了做新旧版本组网消息兼容的版本号
//dm.Version = Sys.Version;
dm.Kind = Type; dm.Kind = Type;
dm.HardID.Copy(Sys.ID, 16); dm.HardID.Copy(Sys.ID, 16);
dm.TranID = TranID; dm.TranID = TranID;
@ -342,7 +343,7 @@ bool TinyClient::OnJoin(const TinyMessage& msg)
Joining = false; Joining = false;
Cfg->SoftVer = dm.Version; Cfg->SoftVer = dm.Version;
// 小于2的版本加不加密 // 小于2的版本不加密
if(dm.Version < 2) Encryption = false; if(dm.Version < 2) Encryption = false;
Cfg->Address = dm.Address; Cfg->Address = dm.Address;

6
TinyNet/TinyServer.cpp
View File

@ -244,6 +244,7 @@ bool TinyServer::OnJoin(const TinyMessage& msg)
JoinMessage dm; JoinMessage dm;
dm.ReadMessage(msg); dm.ReadMessage(msg);
// 规避旧设备的错误数据
if(dm.Kind == 0x1004) return false; if(dm.Kind == 0x1004) return false;
// 根据硬件编码找设备 // 根据硬件编码找设备
@ -310,10 +311,6 @@ bool TinyServer::OnJoin(const TinyMessage& msg)
dv->Show(true); dv->Show(true);
// 响应 // 响应
/*TinyMessage rs;
rs.Code = msg.Code;
rs.Dest = msg.Src;
rs.Seq = msg.Seq;*/
auto rs = msg.CreateReply(); auto rs = msg.CreateReply();
// 发现响应 // 发现响应
@ -327,7 +324,6 @@ bool TinyServer::OnJoin(const TinyMessage& msg)
dm.HardID.Set(Sys.ID, 6); dm.HardID.Set(Sys.ID, 6);
dm.WriteMessage(rs); dm.WriteMessage(rs);
//Send(rs);
rs.State = dv->Mac; rs.State = dv->Mac;
//Control->Send(rs); //Control->Send(rs);
// 组网消息属于广播消息，很可能丢包，重发3次 // 组网消息属于广播消息，很可能丢包，重发3次