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

修正微网组网响应硬件编码超长的BUG

This commit is contained in:
nnhy 2016-03-21 03:33:25 +00:00
parent 288d451756
commit cd6c42749b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TinyNet/JoinMessage.cpp
View File

@ -65,7 +65,7 @@ String& JoinMessage::ToStr(String& str) const
str += "组网"; str += "组网";
if(!Reply) if(!Reply)
{ {
str += " Version=" + Version; str = str + " Version=" + Version;
//str += " Kind="; //str += " Kind=";
str.Format(" Kind=%04X", Kind); str.Format(" Kind=%04X", Kind);
//str += " TranID="; //str += " TranID=";

6
TinyNet/TinyServer.cpp
View File

@ -321,8 +321,12 @@ bool TinyServer::OnJoin(const TinyMessage& msg)
dm.Password = dv->Pass; dm.Password = dv->Pass;
//dm.HardID.Set(Sys.ID, 6); //dm.HardID.Set(Sys.ID, 6);
dm.HardID.Copy(0, Sys.ID, 6); //dm.HardID.Copy(0, Sys.ID, 6);
dm.HardID.SetLength(6);
dm.HardID = Sys.ID;
dm.WriteMessage(rs); dm.WriteMessage(rs);
//dm.Show(true);
//rs.Show();
rs.State = dv->_Mac; rs.State = dv->_Mac;
//Control->Send(rs); //Control->Send(rs);