Skip to content

Commit 41a9655

Browse files
authored
修复直播推荐页面的错误UI (#205)
1 parent 810c00d commit 41a9655

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

src/App/App.csproj

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@
1717
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
1818
<ApplicationIcon>Assets\logo.ico</ApplicationIcon>
1919
</PropertyGroup>
20+
<ItemGroup>
21+
<Content Remove="Assets\ffmpeg\arm64\avcodec-59.dll" />
22+
<Content Remove="Assets\ffmpeg\arm64\avdevice-59.dll" />
23+
<Content Remove="Assets\ffmpeg\arm64\avfilter-8.dll" />
24+
<Content Remove="Assets\ffmpeg\arm64\avformat-59.dll" />
25+
<Content Remove="Assets\ffmpeg\arm64\avutil-57.dll" />
26+
<Content Remove="Assets\ffmpeg\arm64\postproc-56.dll" />
27+
<Content Remove="Assets\ffmpeg\arm64\swresample-4.dll" />
28+
<Content Remove="Assets\ffmpeg\arm64\swscale-6.dll" />
29+
<Content Remove="Assets\ffmpeg\x64\avcodec-59.dll" />
30+
<Content Remove="Assets\ffmpeg\x64\avdevice-59.dll" />
31+
<Content Remove="Assets\ffmpeg\x64\avfilter-8.dll" />
32+
<Content Remove="Assets\ffmpeg\x64\avformat-59.dll" />
33+
<Content Remove="Assets\ffmpeg\x64\avutil-57.dll" />
34+
<Content Remove="Assets\ffmpeg\x64\postproc-56.dll" />
35+
<Content Remove="Assets\ffmpeg\x64\swresample-4.dll" />
36+
<Content Remove="Assets\ffmpeg\x64\swscale-6.dll" />
37+
</ItemGroup>
2038
<ItemGroup>
2139
<None Remove="Assets\AppCenterSecret.txt" />
2240
<None Remove="Assets\DashAudioWithoutVideoTemplate.xml" />
@@ -201,6 +219,33 @@
201219
<Content Update="Assets\AppCenterSecret.txt">
202220
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
203221
</Content>
222+
<None Update="Assets\ffmpeg\x64\avcodec-59.dll">
223+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
224+
</None>
225+
<None Update="Assets\ffmpeg\x64\avdevice-59.dll">
226+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227+
</None>
228+
<None Update="Assets\ffmpeg\x64\avfilter-8.dll">
229+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230+
</None>
231+
<None Update="Assets\ffmpeg\x64\avformat-59.dll">
232+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
233+
</None>
234+
<None Update="Assets\ffmpeg\x64\avutil-57.dll">
235+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
236+
</None>
237+
<None Update="Assets\ffmpeg\x64\postproc-56.dll">
238+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
239+
</None>
240+
<None Update="Assets\ffmpeg\x64\swresample-4.dll">
241+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
242+
</None>
243+
<None Update="Assets\ffmpeg\x64\swscale-6.dll">
244+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
245+
</None>
246+
<None Update="Assets\ffmpeg\arm64\swresample-4.dll">
247+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
248+
</None>
204249
<Page Update="Controls\Markdown\MarkdownTextBlock.xaml">
205250
<Generator>MSBuild:Compile</Generator>
206251
</Page>

src/App/Controls/Modules/LiveRecommendDetailModule.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,13 @@
6363
</Grid>
6464
</ScrollViewer>
6565

66-
<controls:OverlayLoadingPanel IsBarActive="{x:Bind ViewModel.IsIncrementalLoading, Mode=OneWay}" IsRingActive="{x:Bind ViewModel.IsReloading, Mode=OneWay}" />
66+
<controls:OverlayLoadingPanel
67+
Grid.Row="1"
68+
IsBarActive="{x:Bind ViewModel.IsIncrementalLoading, Mode=OneWay}"
69+
IsRingActive="{x:Bind ViewModel.IsReloading, Mode=OneWay}" />
6770
<controls:ErrorPanel
6871
x:Name="ErrorPanel"
72+
Grid.Row="1"
6973
VerticalAlignment="Center"
7074
ActionContent="{ext:Locale Name=Refresh}"
7175
Command="{x:Bind ViewModel.ReloadCommand}"

0 commit comments

Comments
 (0)