diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index d27d63a1..858dc923 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -30,6 +30,10 @@ namespace v2rayN.Handler _selecteds = new List(); foreach (var it in selecteds) { + if (it.configType == EConfigType.Custom) + { + continue; + } _selecteds.Add(new ServerTestItem() { indexId = it.indexId, @@ -38,6 +42,25 @@ namespace v2rayN.Handler configType = it.configType }); } + //clear test result + foreach (var it in _selecteds) + { + switch (actionType) + { + case ESpeedActionType.Ping: + case ESpeedActionType.Tcping: + case ESpeedActionType.Realping: + UpdateFunc(it.indexId, ResUI.Speedtesting, ""); + break; + case ESpeedActionType.Speedtest: + UpdateFunc(it.indexId, "", ResUI.Speedtesting); + break; + case ESpeedActionType.Mixedtest: + UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.Speedtesting); + break; + } + } + switch (actionType) { case ESpeedActionType.Ping: @@ -199,11 +222,11 @@ namespace v2rayN.Handler continue; } if (it.delay < 0) - { + { + UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip); continue; } _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1"); - UpdateFunc(it.indexId, "", ResUI.Speedtesting); var item = LazyConfig.Instance.GetProfileItem(it.indexId); if (item is null) continue; diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index b9a134af..928d540e 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -1752,6 +1752,15 @@ namespace v2rayN.Resx { } } + /// + /// 查找类似 Skip test 的本地化字符串。 + /// + public static string SpeedtestingSkip { + get { + return ResourceManager.GetString("SpeedtestingSkip", resourceCulture); + } + } + /// /// 查找类似 PAC failed to start. Please run this program as Administrator. 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 84af07ff..76abdba0 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -1072,4 +1072,7 @@ AutoRefresh + + Skip test + \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index 5fd8c962..ff7c33f9 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -1072,4 +1072,7 @@ 自动刷新 + + 跳过测试 + \ No newline at end of file diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 7cfdaae4..c6188e8e 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -105,9 +105,6 @@ PreserveNewest - - PreserveNewest -