From 78f9af8b7d5cf896aaab2fa9a9fdc8068ae4a3f2 Mon Sep 17 00:00:00 2001
From: WangQiang <807319473@qq.com>
Date: Mon, 19 Sep 2016 09:52:01 +0000
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87DevArr=20=E7=9A=84length=20?=
 =?UTF-8?q?=E5=9C=A8delete=E8=AE=BE=E5=A4=87=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=20TinyServer=20=E5=8F=AA?=
 =?UTF-8?q?=E4=B8=8D=E7=BB=B4=E6=8A=A4=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E7=AE=A1=E7=BB=B4=E6=8A=A4LastTime=E5=B0=B1?=
 =?UTF-8?q?=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TinyNet/TinyServer.cpp         | 4 ++--
 TokenNet/DevicesManagement.cpp | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

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();