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