修复第一周不显示的问题

YJammak · Jan 3, 2023 · 7beb3ff · 7beb3ff
1 parent 8bc1e97
commit 7beb3ff
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/src/Weather/Weather.csproj b/src/Weather/Weather.csproj
@@ -12,9 +12,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="108.0.2" />
-        <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="RestSharp" Version="108.0.3" />
+        <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WeatherCalendar/ViewModels/CalendarViewModel.cs b/src/WeatherCalendar/ViewModels/CalendarViewModel.cs
@@ -114,14 +114,29 @@ private void UpdateForecast(WeatherForecast weatherForecast)
         }
     }
 
+    private static DateTime GetFirstDayOfWeek(DateTime dateTime)
+    {
+        return dateTime.DayOfWeek switch
+        {
+            DayOfWeek.Sunday => dateTime.AddDays(-6),
+            DayOfWeek.Monday => dateTime,
+            DayOfWeek.Tuesday => dateTime.AddDays(-1),
+            DayOfWeek.Wednesday => dateTime.AddDays(-2),
+            DayOfWeek.Thursday => dateTime.AddDays(-3),
+            DayOfWeek.Friday => dateTime.AddDays(-4),
+            DayOfWeek.Saturday => dateTime.AddDays(-5),
+            _ => dateTime
+        };
+    }
+
     /// <summary>
     /// 更新日历日期
     /// </summary>
     /// <param name="date"></param>
     private void UpdateDate(DateTime date)
     {
         var firstDayOfMonth = new DateTime(date.Year, date.Month, 1);
-        var startDateOfPage = firstDayOfMonth.AddDays(1 - (int)firstDayOfMonth.DayOfWeek);
+        var startDateOfPage = GetFirstDayOfWeek(firstDayOfMonth);
 
         var daysOfMonth = (int)(firstDayOfMonth.AddMonths(1) - firstDayOfMonth).TotalDays;
         var endDayOfMonth = firstDayOfMonth.AddDays(daysOfMonth - 1);

diff --git a/src/WeatherCalendar/WeatherCalendar.csproj b/src/WeatherCalendar/WeatherCalendar.csproj
@@ -5,10 +5,10 @@
         <TargetFramework>net7.0-windows</TargetFramework>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>Icon.ico</ApplicationIcon>
-        <Copyright>Copyright © 2021-2022 Y.J.K. All rights reserved.</Copyright>
-        <AssemblyVersion>0.4.2.0</AssemblyVersion>
-        <FileVersion>0.4.2.0</FileVersion>
-        <Version>0.4.2.0</Version>
+        <Copyright>Copyright © 2021-2023 Y.J.K. All rights reserved.</Copyright>
+        <AssemblyVersion>0.4.3.0</AssemblyVersion>
+        <FileVersion>0.4.3.0</FileVersion>
+        <Version>0.4.3.0</Version>
         <Authors>Y.J.K</Authors>
         <Product>天气日历</Product>
         <PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
@@ -24,21 +24,21 @@
         <PackageReference Include="Anotar.NLog.Fody" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="DynamicData" Version="7.12.1" />
-        <PackageReference Include="Enums.NET" Version="4.0.0" />
+        <PackageReference Include="DynamicData" Version="7.12.11" />
+        <PackageReference Include="Enums.NET" Version="4.0.1" />
         <PackageReference Include="Fody" Version="6.6.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.74" />
         <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NLog" Version="5.0.5" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="NLog" Version="5.1.1" />
         <PackageReference Include="NPinyin.Core" Version="3.0.0" />
         <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
-        <PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />
-        <PackageReference Include="ReactiveUI.Validation" Version="3.0.1" />
-        <PackageReference Include="ReactiveUI.WPF" Version="18.3.1" />
+        <PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
+        <PackageReference Include="ReactiveUI.Validation" Version="3.0.22" />
+        <PackageReference Include="ReactiveUI.WPF" Version="18.4.1" />
         <PackageReference Include="System.Management" Version="7.0.0" />
         <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
         <PackageReference Include="Ymiot.Core" Version="0.1.0" />