Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

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

Merged
merged 1 commit into from
Sep 22, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/App/Pages/Overlay/PgcIndexPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 2 additions & 13 deletions src/ViewModels/ViewModels.Uwp.UnitTests/ViewModels.Uwp.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 18 additions & 2 deletions src/ViewModels/ViewModels.Uwp/Pgc/PgcViewModelBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ public PgcViewModelBase(PgcType type)
[Reactive]
public bool IsIndexRequested { get; set; }

/// <summary>
/// 是否显示为空白.
/// </summary>
[Reactive]
public bool IsEmpty { get; set; }

/// <summary>
/// 加载索引.
/// </summary>
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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;
}
}
}
Expand Down