From 28139853a8087d81e1ac7ffaf7013b937958f5d2 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sun, 20 Sep 2026 10:31:00 +0800 Subject: [PATCH] up 7.25.2 https://github.com/2dust/v2rayN/commit/5d9718a0bb93fe4bfa6d8a9a8f985e4f16642ba1 --- v2rayN/ServiceLib/Base/BulkObservableCollection.cs | 9 +++++++-- v2rayN/ServiceLib/GlobalUsings.cs | 10 +++++----- v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs | 4 ++-- v2rayN/ServiceLib/Services/SpeedtestService.cs | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/v2rayN/ServiceLib/Base/BulkObservableCollection.cs b/v2rayN/ServiceLib/Base/BulkObservableCollection.cs index 90881a6c..497a9de6 100644 --- a/v2rayN/ServiceLib/Base/BulkObservableCollection.cs +++ b/v2rayN/ServiceLib/Base/BulkObservableCollection.cs @@ -8,8 +8,13 @@ public class BulkObservableCollection : ObservableCollection { } - public BulkObservableCollection(IEnumerable collection) : base(collection) { } - public BulkObservableCollection(List list) : base(list) { } + public BulkObservableCollection(IEnumerable collection) : base(collection) + { + } + + public BulkObservableCollection(List list) : base(list) + { + } protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e) { diff --git a/v2rayN/ServiceLib/GlobalUsings.cs b/v2rayN/ServiceLib/GlobalUsings.cs index b7b3ecc4..9ebc2cfc 100644 --- a/v2rayN/ServiceLib/GlobalUsings.cs +++ b/v2rayN/ServiceLib/GlobalUsings.cs @@ -6,11 +6,6 @@ global using System.Diagnostics; global using System.Net; global using System.Net.NetworkInformation; global using System.Net.Sockets; -global using ReactiveUI.Primitives; -global using ReactiveUI.Primitives.Concurrency; -global using ReactiveUI.Primitives.Extensions; -global using ReactiveUI.Primitives.Disposables; -global using ReactiveUI.Primitives.Signals; global using System.Reflection; global using System.Runtime.InteropServices; global using System.Runtime.Versioning; @@ -22,6 +17,11 @@ global using System.Text.Json.Nodes; global using System.Text.Json.Serialization; global using System.Text.RegularExpressions; global using ReactiveUI; +global using ReactiveUI.Primitives; +global using ReactiveUI.Primitives.Concurrency; +global using ReactiveUI.Primitives.Disposables; +global using ReactiveUI.Primitives.Extensions; +global using ReactiveUI.Primitives.Signals; global using ReactiveUI.SourceGenerators; global using ServiceLib.Base; global using ServiceLib.Common; diff --git a/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs b/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs index 80469760..d4602c65 100644 --- a/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs +++ b/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs @@ -3,9 +3,9 @@ namespace ServiceLib.Models.Dto; [Serializable] public partial class ClashProxyModel : ReactiveObject { - public required string Name { get; set; } + public string Name { get; set; } - public required string Type { get; set; } + public string Type { get; set; } public string? Now { get; set; } diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs index 84d2ecf8..00d03882 100644 --- a/v2rayN/ServiceLib/Services/SpeedtestService.cs +++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs @@ -76,7 +76,7 @@ public class SpeedtestService(Config config, Func updateF runCts.Dispose(); } } - + private async Task RunAsync(ESpeedActionType actionType, List selecteds, CancellationToken ct = default) { var lstSelected = await GetClearItem(actionType, selecteds); @@ -178,9 +178,11 @@ public class SpeedtestService(Config config, Func updateF case ESpeedActionType.UdpTest: await UpdateFunc(it.IndexId, message, ""); break; + case ESpeedActionType.Speedtest: await UpdateFunc(it.IndexId, "", message); break; + case ESpeedActionType.Mixedtest: await UpdateFunc(it.IndexId, message, message); break;