修复直播推荐页面的错误UI (#205)

Richasy · Jan 5, 2024 · 41a9655 · 41a9655
1 parent 810c00d
commit 41a9655
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -17,6 +17,24 @@
         <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
         <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
     </PropertyGroup>
+    <ItemGroup>
+      <Content Remove="Assets\ffmpeg\arm64\avcodec-59.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\avdevice-59.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\avfilter-8.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\avformat-59.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\avutil-57.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\postproc-56.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\swresample-4.dll" />
+      <Content Remove="Assets\ffmpeg\arm64\swscale-6.dll" />
+      <Content Remove="Assets\ffmpeg\x64\avcodec-59.dll" />
+      <Content Remove="Assets\ffmpeg\x64\avdevice-59.dll" />
+      <Content Remove="Assets\ffmpeg\x64\avfilter-8.dll" />
+      <Content Remove="Assets\ffmpeg\x64\avformat-59.dll" />
+      <Content Remove="Assets\ffmpeg\x64\avutil-57.dll" />
+      <Content Remove="Assets\ffmpeg\x64\postproc-56.dll" />
+      <Content Remove="Assets\ffmpeg\x64\swresample-4.dll" />
+      <Content Remove="Assets\ffmpeg\x64\swscale-6.dll" />
+    </ItemGroup>
     <ItemGroup>
         <None Remove="Assets\AppCenterSecret.txt" />
         <None Remove="Assets\DashAudioWithoutVideoTemplate.xml" />
@@ -201,6 +219,33 @@
       <Content Update="Assets\AppCenterSecret.txt">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       </Content>
+      <None Update="Assets\ffmpeg\x64\avcodec-59.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\avdevice-59.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\avfilter-8.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\avformat-59.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\avutil-57.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\postproc-56.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\swresample-4.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\x64\swscale-6.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="Assets\ffmpeg\arm64\swresample-4.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
       <Page Update="Controls\Markdown\MarkdownTextBlock.xaml">
         <Generator>MSBuild:Compile</Generator>
       </Page>

diff --git a/src/App/Controls/Modules/LiveRecommendDetailModule.xaml b/src/App/Controls/Modules/LiveRecommendDetailModule.xaml
@@ -63,9 +63,13 @@
             </Grid>
         </ScrollViewer>
 
-        <controls:OverlayLoadingPanel IsBarActive="{x:Bind ViewModel.IsIncrementalLoading, Mode=OneWay}" IsRingActive="{x:Bind ViewModel.IsReloading, Mode=OneWay}" />
+        <controls:OverlayLoadingPanel
+            Grid.Row="1"
+            IsBarActive="{x:Bind ViewModel.IsIncrementalLoading, Mode=OneWay}"
+            IsRingActive="{x:Bind ViewModel.IsReloading, Mode=OneWay}" />
         <controls:ErrorPanel
             x:Name="ErrorPanel"
+            Grid.Row="1"
             VerticalAlignment="Center"
             ActionContent="{ext:Locale Name=Refresh}"
             Command="{x:Bind ViewModel.ReloadCommand}"