Skip to content

Commit 27b38e7

Browse files
committed
修复日期突然改变提示信息中的距今天数不更新问题,升级依赖库
1 parent d2a6366 commit 27b38e7

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
1212
<PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
1313
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
14-
<PackageVersion Include="NLog" Version="6.0.7" />
14+
<PackageVersion Include="NLog" Version="6.1.0" />
1515
<PackageVersion Include="NPinyin.Core" Version="3.0.0" />
1616
<PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
1717
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />

src/WeatherCalendar/Views/DayView.xaml.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using ReactiveMarbles.ObservableEvents;
99
using ReactiveUI;
1010
using Splat;
11+
using WeatherCalendar.Services;
1112
using WeatherCalendar.Themes;
1213

1314
namespace WeatherCalendar.Views;
@@ -201,6 +202,14 @@ private void WhenActivated(CompositeDisposable disposable)
201202
dateInfo => GetDaysFromTodayInfo(dateInfo.Date))
202203
.DisposeWith(disposable);
203204

205+
var appService = Locator.Current.GetService<AppService>();
206+
appService
207+
.TimerPerDay
208+
.ObserveOn(RxApp.MainThreadScheduler)
209+
.Do(_ => DaysTextBlock.Text = GetDaysFromTodayInfo(ViewModel!.Date.Date))
210+
.Subscribe()
211+
.DisposeWith(disposable);
212+
204213
this.WhenAnyValue(
205214
x => x.ViewModel.Date.Date,
206215
x => x.ViewModel.HolidayName,

src/WeatherCalendar/WeatherCalendar.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<TargetFramework>net10.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationIcon>Icon.ico</ApplicationIcon>
8-
<Copyright>Copyright © 2021-2025 YJammak All rights reserved.</Copyright>
9-
<AssemblyVersion>0.4.6.1</AssemblyVersion>
10-
<FileVersion>0.4.6.1</FileVersion>
11-
<Version>0.4.6.1</Version>
8+
<Copyright>Copyright © 2021-2026 YJammak All rights reserved.</Copyright>
9+
<AssemblyVersion>0.4.6.2</AssemblyVersion>
10+
<FileVersion>0.4.6.2</FileVersion>
11+
<Version>0.4.6.2</Version>
1212
<Authors>YJammak</Authors>
1313
<Product>天气日历</Product>
1414
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>

0 commit comments

Comments
 (0)