diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 7473ffa5..c9770c5a 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -140,7 +140,6 @@ namespace v2rayN.Handler config.guiItem = new() { enableStatistics = false, - statisticsFreshRate = 1, }; } if (config.uiItem == null) @@ -185,11 +184,6 @@ namespace v2rayN.Handler config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl; } - if (config.guiItem.statisticsFreshRate is > 100 or < 1) - { - config.guiItem.statisticsFreshRate = 1; - } - if (config.mux4Sbox == null) { config.mux4Sbox = new() @@ -331,7 +325,6 @@ namespace v2rayN.Handler config.guiItem = new() { enableStatistics = configOld.enableStatistics, - statisticsFreshRate = configOld.statisticsFreshRate, keepOlderDedupl = configOld.keepOlderDedupl, ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore, autoUpdateInterval = configOld.autoUpdateInterval, diff --git a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs index f2a74af3..ef70f02a 100644 --- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs +++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs @@ -61,8 +61,7 @@ namespace v2rayN.Handler _updateFunc(server); } } - var sleep = _config.guiItem.statisticsFreshRate < 1 ? 1 : _config.guiItem.statisticsFreshRate; - await Task.Delay(1000 * sleep); + await Task.Delay(1000); await _channel.ConnectAsync(); } catch diff --git a/v2rayN/v2rayN/Mode/ConfigItems.cs b/v2rayN/v2rayN/Mode/ConfigItems.cs index 25b91608..a5103559 100644 --- a/v2rayN/v2rayN/Mode/ConfigItems.cs +++ b/v2rayN/v2rayN/Mode/ConfigItems.cs @@ -88,8 +88,6 @@ namespace v2rayN.Mode public bool enableStatistics { get; set; } - public int statisticsFreshRate { get; set; } - public bool keepOlderDedupl { get; set; } public bool ignoreGeoUpdateCore { get; set; } = true; diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index 8dacf39f..576ff1a3 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -2752,15 +2752,6 @@ namespace v2rayN.Resx { } } - /// - /// 查找类似 Statistics freshrate (second) 的本地化字符串。 - /// - public static string TbSettingsStatisticsFreshRate { - get { - return ResourceManager.GetString("TbSettingsStatisticsFreshRate", resourceCulture); - } - } - /// /// 查找类似 Subscription conversion Url 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx index 39f211d2..85d8648e 100644 --- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx +++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx @@ -793,9 +793,6 @@ فعال کردن آمار (نیاز به راه اندازی مجدد) - - نرخ تازه سازی آمار (ثانیه) - Subscription conversion Url diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 5b513251..0f500264 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -796,9 +796,6 @@ Enable Statistics (Require restart) - - Statistics freshrate (second) - Subscription conversion Url diff --git a/v2rayN/v2rayN/Resx/ResUI.ru.resx b/v2rayN/v2rayN/Resx/ResUI.ru.resx index 30e796ab..07f90df6 100644 --- a/v2rayN/v2rayN/Resx/ResUI.ru.resx +++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx @@ -796,9 +796,6 @@ Включить статистику (требуется перезагрузка) - - Частота обновления статистики в секундах - URL-адрес конверсии подписки diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index 8de8f034..787d3023 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -796,9 +796,6 @@ 启用统计(实时网速显示,需重启) - - 统计刷新频率(单位秒) - 订阅转换网址(可选) diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs index b1d9e803..e64d3aa2 100644 --- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs @@ -51,7 +51,6 @@ namespace v2rayN.ViewModels [Reactive] public bool AutoRun { get; set; } [Reactive] public bool EnableStatistics { get; set; } - [Reactive] public int StatisticsFreshRate { get; set; } [Reactive] public bool KeepOlderDedupl { get; set; } [Reactive] public bool IgnoreGeoUpdateCore { get; set; } [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; } @@ -141,7 +140,6 @@ namespace v2rayN.ViewModels AutoRun = _config.guiItem.autoRun; EnableStatistics = _config.guiItem.enableStatistics; - StatisticsFreshRate = _config.guiItem.statisticsFreshRate; KeepOlderDedupl = _config.guiItem.keepOlderDedupl; IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore; EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth; @@ -291,11 +289,6 @@ namespace v2rayN.ViewModels Utils.SetAutoRun(AutoRun); _config.guiItem.autoRun = AutoRun; _config.guiItem.enableStatistics = EnableStatistics; - _config.guiItem.statisticsFreshRate = StatisticsFreshRate; - if (_config.guiItem.statisticsFreshRate > 100 || _config.guiItem.statisticsFreshRate < 1) - { - _config.guiItem.statisticsFreshRate = 1; - } _config.guiItem.keepOlderDedupl = KeepOlderDedupl; _config.guiItem.ignoreGeoUpdateCore = IgnoreGeoUpdateCore; _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth; diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml index ac4c5272..c2683b15 100644 --- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml +++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml @@ -1,12 +1,12 @@  - - - { cmbMtu.Items.Add(it); @@ -150,7 +146,6 @@ namespace v2rayN.Views this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.StatisticsFreshRate, v => v.cmbStatisticsFreshRate.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);