From 8e9d49c921cf1064b41c29c8b3681987e65fc440 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 21 Jul 2022 17:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E8=BF=91=E7=9A=84=E4=BA=BA=E4=B8=8E?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96&?= =?UTF-8?q?=E7=99=BB=E5=87=BA=E5=8F=96=E6=B6=88=E8=AE=BE=E5=A4=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Apis/PfHttpClientHandler.cs | 1 - Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs | 8 +++++--- Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Apis/PfHttpClientHandler.cs b/Assets/Scripts/Apis/PfHttpClientHandler.cs index 872244a5..4b6cdbe9 100644 --- a/Assets/Scripts/Apis/PfHttpClientHandler.cs +++ b/Assets/Scripts/Apis/PfHttpClientHandler.cs @@ -65,7 +65,6 @@ namespace Assets.Scripts.Apis { //释放资源 MapUDPService.Dispose(); - App.MainDeviceAdapter.Dispose(); //删除本地文件 Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder); App.tempRecordData = null; diff --git a/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs b/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs index 9d9b50bb..1548fe47 100644 --- a/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs +++ b/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs @@ -457,10 +457,12 @@ namespace Assets.Scripts.Ble { if (bleMobileThread == null) return; - //bleMobileThread.ManagerInitialized -= BleMobileThread_ManagerInitialized; - //bleMobileThread.ManagerStatusChanged -= ManagerStatusChanged; - //bleMobileThread.ScanInfoReceived -= WatcherScanInfoReceived; + bleMobileThread.ManagerInitialized -= BleMobileThread_ManagerInitialized; + bleMobileThread.ManagerStatusChanged -= ManagerStatusChanged; + bleMobileThread.ScanInfoReceived -= WatcherScanInfoReceived; bleMobileThread.Dispose(); + bleMobileThread = null; + hwInterface = null; pCache.Clear(); } diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 53871394..2879a0b3 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -584,7 +584,7 @@ namespace Assets.Scenes.Ride.Scripts var msgs = RemoveExceptionData(mes); //LastActiveTime = DateTime.Now; var ids = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.MemberId); - var routeIds = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.RouteId); + var routeIds = msgs.Where(m => onlineUsers.All(u => u.RouteId != m.RouteId)).Select(m => m.RouteId); if (ids.Any()) { List notCachedIds = new List(); @@ -603,7 +603,7 @@ namespace Assets.Scenes.Ride.Scripts if (notCachedIds.Count > 0) { - var rangeUser = ConfigHelper.mapApi.GetOnlineUserInfo(ids).data; + var rangeUser = ConfigHelper.mapApi.GetOnlineUserInfo(notCachedIds).data; onlineUsers.AddRange(rangeUser); App.userList.AddRange(rangeUser); }