diff --git a/TinyNet/TinyServer.cpp b/TinyNet/TinyServer.cpp index 842bd6e3..9b747e9b 100644 --- a/TinyNet/TinyServer.cpp +++ b/TinyNet/TinyServer.cpp @@ -132,7 +132,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl) // 设置当前设备 Current = dv; OnPing(msg); - pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); // 成功收到Ping才等于上线 + // pDevMgmt->DeviceRequest(DeviceAtions::Online, dv); // 成功收到Ping才等于上线 break; case 5: case 0x15: @@ -156,7 +156,7 @@ void TinyServer::OnReceive(TinyMessage& msg, TinyController& ctrl) } // 更新设备信息 - if(dv) dv->LastTime = Sys.Seconds(); + if(dv && msg.Code > 2) dv->LastTime = Sys.Seconds(); // 设置当前设备 Current = dv; diff --git a/TokenNet/DevicesManagement.cpp b/TokenNet/DevicesManagement.cpp index 2078cfc3..b22c925b 100644 --- a/TokenNet/DevicesManagement.cpp +++ b/TokenNet/DevicesManagement.cpp @@ -82,9 +82,11 @@ bool DevicesManagement::DeleteDev(byte id) { debug_printf("DevicesManagement::DeleteDev Del id: 0x%02X\r\n", id); - int idx = DevArr.FindIndex(dv); - debug_printf("idx~~~~~~~~~~~:%d\r\n", idx); - if (idx >= 0)DevArr[idx] = nullptr; + // int idx = DevArr.FindIndex(dv); + // debug_printf("idx~~~~~~~~~~~:%d\r\n", idx); + // if (idx >= 0)DevArr[idx] = nullptr; + // DevArr.RemoveAt(idx); + DevArr.Remove(dv); delete dv; SaveDev();