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

设备超时连不上服务器以后，也不能重新组网，否则可能跑到别的网关那里去。 

必须手工清除才能重新组网。
This commit is contained in:
nnhy 2016-01-15 07:10:56 +00:00
parent 954209dc13
commit 90092ff0b7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TinyNet/TinyClient.cpp
View File

@ -61,7 +61,7 @@ void TinyClient::Open()
HardCrc = Crc::Hash16(Array(Sys.ID, 16)); HardCrc = Crc::Hash16(Array(Sys.ID, 16));
if(Sys.Version > 1) Encryption = true; if(Sys.Version > 1) Encryption = true;
Control->Mode = 0; // 客户端只接收自己的消息 Control->Mode = 0; // 客户端只接收自己的消息
Control->Open(); Control->Open();
@ -202,15 +202,15 @@ void TinyClient::OnWrite(const TinyMessage& msg)
Array bs(Cfg, Cfg->Length); Array bs(Cfg, Cfg->Length);
//debug_printf("\r\nCfg->Length %d\r\n",Cfg->Length); //debug_printf("\r\nCfg->Length %d\r\n",Cfg->Length);
rt = dm.WriteData(bs, true); rt = dm.WriteData(bs, true);
Cfg->Save(); Cfg->Save();
debug_printf("\r\n 配置区被修改，200ms后重启\r\n"); debug_printf("\r\n 配置区被修改，200ms后重启\r\n");
rs.Error = !rt; rs.Error = !rt;
rs.Length = ms.Position(); rs.Length = ms.Position();
Reply(rs); Reply(rs);
Sys.Sleep(200); Sys.Sleep(200);
Sys.Reset(); Sys.Reset();
} }
@ -450,12 +450,12 @@ void TinyClient::Ping()
{ {
TS("TinyClient::Ping"); TS("TinyClient::Ping");
ushort off = (Cfg->OfflineTime)*5; /*ushort off = (Cfg->OfflineTime)*5;
debug_printf(" TinyClient::Ping Cfg->OfflineTime:%d\r\n", Cfg->OfflineTime); //debug_printf(" TinyClient::Ping Cfg->OfflineTime:%d\r\n", Cfg->OfflineTime);
ushort now = Sys.Seconds(); ushort now = Sys.Seconds();
if(off < 10) off = 30; if(off < 10) off = 30;
if(LastActive > 0 && LastActive + off * 1000 < Sys.Ms()) if(LastActive > 0 && LastActive + off * 1000 < Sys.Ms())
{ {
if(Server == 0) return; if(Server == 0) return;
@ -477,7 +477,7 @@ void TinyClient::Ping()
//Password.SetLength(0); //Password.SetLength(0);
//return; //return;
} }*/
TinyMessage msg; TinyMessage msg;
msg.Code = 3; msg.Code = 3;