修复PGC内容不能通过年份索引的问题 (#238)

Richasy · Sep 22, 2021 · 5f3d023 · 5f3d023
1 parent e395a9c
commit 5f3d023
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/App/Pages/Overlay/PgcIndexPage.xaml b/src/App/Pages/Overlay/PgcIndexPage.xaml
@@ -115,6 +115,7 @@
                 ActionContent="{loc:LocaleLocator Name=Refresh}"
                 Text="{x:Bind ViewModel.IndexErrorText, Mode=OneWay}"
                 Visibility="{x:Bind ViewModel.IsIndexError, Mode=OneWay}" />
+            <controls:ErrorPanel Text="{loc:LocaleLocator Name=NoSpecificData}" Visibility="{x:Bind ViewModel.IsEmpty, Mode=OneWay}" />
         </Grid>
     </Grid>
 </Page>
diff --git a/src/ViewModels/ViewModels.Uwp.UnitTests/ViewModels.Uwp.UnitTests.csproj b/src/ViewModels/ViewModels.Uwp.UnitTests/ViewModels.Uwp.UnitTests.csproj
@@ -41,22 +41,11 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions">
-      <Version>5.10.3</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.SDK">
-      <Version>16.7.1</Version>
-    </PackageReference>
-    <PackageReference Include="xunit">
-      <Version>2.4.1</Version>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.4.1</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="SpecFlow">
+      <Version>3.9.22</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ViewModels/ViewModels.Uwp/Pgc/PgcViewModelBase.cs b/src/ViewModels/ViewModels.Uwp/Pgc/PgcViewModelBase.cs
@@ -105,6 +105,12 @@ public PgcViewModelBase(PgcType type)
         [Reactive]
         public bool IsIndexRequested { get; set; }
 
+        /// <summary>
+        /// 是否显示为空白.
+        /// </summary>
+        [Reactive]
+        public bool IsEmpty { get; set; }
+
         /// <summary>
         /// 加载索引.
         /// </summary>
@@ -192,7 +198,13 @@ private async Task RequestIndexRequestAsync()
             {
                 if (condition.SelectedItem != null)
                 {
-                    queryPrameters.Add(condition.Id, condition.SelectedItem.Id);
+                    var id = condition.SelectedItem.Id;
+                    if (condition.Id == "year")
+                    {
+                        id = Uri.EscapeDataString(condition.SelectedItem.Id);
+                    }
+
+                    queryPrameters.Add(condition.Id, id);
                 }
             }
 
@@ -203,10 +215,14 @@ private void OnPgcIndexResultIteration(object sender, PgcIndexResultIterationEve
         {
             if (e.Type == Type)
             {
-                e.List.ForEach(p => ItemCollection.Add(new SeasonViewModel(p)));
+                if (e.List != null)
+                {
+                    e.List.ForEach(p => ItemCollection.Add(new SeasonViewModel(p)));
+                }
 
                 _isIndexLoadCompleted = !e.HasNext || e.TotalCount <= ItemCollection.Count;
                 _indexPageNumber = e.NextPageNumber;
+                IsEmpty = ItemCollection.Count == 0;
             }
         }
     }