fix conflicts

This commit is contained in:
guiling
2026-05-10 14:50:19 +08:00
parent ad6e61daf3
commit bd51b08781
3 changed files with 9 additions and 3 deletions
+6
View File
@@ -1,5 +1,11 @@
# Changelog
## v1.0.3 (2026-05-10)
### 更改
- **刷新率从 100ms 提升至 30ms**,速度曲线更新更加丝滑
- 历史数据点从 600 增至 2000,保持约 60 秒曲线窗口
## v1.0.2 (2026-05-09)
### 更改
+1 -1
View File
@@ -98,7 +98,7 @@
</Button>
<!-- Version -->
<TextBlock Grid.Row="10" Text="Version 1.0.2"
<TextBlock Grid.Row="10" Text="Version 1.0.3"
FontSize="11" Foreground="#FF1E293B"
HorizontalAlignment="Center"
Margin="0,16,0,0" />
+2 -2
View File
@@ -22,14 +22,14 @@ public class MainViewModel : INotifyPropertyChanged, IDisposable
private DateTime _lastNodeFetchTime = DateTime.MinValue;
private bool _isPolling;
private string? _groupName;
private const int MaxHistoryPoints = 600;
private const int MaxHistoryPoints = 2000;
private static readonly TimeSpan NodeFetchInterval = TimeSpan.FromSeconds(3);
public MainViewModel()
{
var config = ConfigService.Load();
_apiService = new ClashApiService(config);
_speedTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(100) };
_speedTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(30) };
_speedTimer.Tick += OnSpeedTimerTick;
}