Fix the issue of incomplete loading of the failed list display

SingleVrUser · Mar 31, 2024 · fe6259b · fe6259b
1 parent ab442a4
commit fe6259b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 28 deletions.
diff --git a/Display/App.xaml b/Display/App.xaml
@@ -465,8 +465,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
-
         </ResourceDictionary>
 
 

diff --git a/Display/Controls/UserController/ShowCountControl.xaml b/Display/Controls/UserController/ShowCountControl.xaml
@@ -5,7 +5,6 @@
     x:Class="Display.Controls.UserController.ShowCountControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Display.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">

diff --git a/Display/Controls/UserController/VideoCoverDisplay.xaml b/Display/Controls/UserController/VideoCoverDisplay.xaml
@@ -718,11 +718,14 @@
         <DataTemplate x:Key="FailListTemplate"
                       x:DataType="file:Datum">
             <Grid x:Name="FailGrid"
+                  BorderBrush="{ThemeResource ControlElevationBorderBrush}"
                   BorderThickness="{StaticResource ButtonBorderThemeThickness}"
                   Tapped="FailGrid_Tapped"
                   PointerEntered="FailGrid_PointerEntered"
                   PointerExited="FailGrid_PointerExited"
-                  Margin="5,0">
+                  Margin="5,0"
+                  Padding="5"
+                  CornerRadius="5">
 
                 <Grid.ContextFlyout>
                     <MenuFlyout>

diff --git a/Display/Controls/UserController/VideoCoverDisplay.xaml.cs b/Display/Controls/UserController/VideoCoverDisplay.xaml.cs
@@ -6,13 +6,15 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Display.Helper.UI;
 using Display.Models.Api.OneOneFive.File;
 using Display.Models.Data.IncrementalCollection;
 using Display.Models.Dto.OneOneFive;
 using Display.Models.Entities;
 using Display.Models.Entities.OneOneFive;
 using Display.Models.Enums.OneOneFive;
 using Display.Models.Vo;
+using Display.Models.Vo.IncrementalCollection;
 using Display.Models.Vo.OneOneFive;
 using Display.Providers;
 using Microsoft.UI.Input;
@@ -118,16 +120,11 @@ public bool IsShowSearchListView
     /// <param name="isShowSuccessFlyout"></param>
     private void ChangedOrderButtonFlyout(bool isShowSuccessFlyout)
     {
-        //显示成功的排序
-        if (isShowSuccessFlyout)
-        {
-            OrderButton.Flyout = Resources["SuccessOrderFlyout"] as Flyout;
-        }
-        //显示失败的排序
-        else
-        {
-            OrderButton.Flyout = Resources["FailOrderFlyout"] as Flyout;
-        }
+        if (this.TryGetResourceValue<Flyout>(
+                isShowSuccessFlyout
+                ? "SuccessOrderFlyout"
+                : "FailOrderFlyout", out var flout))
+            OrderButton.Flyout = flout;
     }
 
     /// <summary>

diff --git a/Display/Models/Vo/IncrementalCollection/IncrementalLoadFailDatumInfoCollection.cs b/Display/Models/Vo/IncrementalCollection/IncrementalLoadFailDatumInfoCollection.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Display.Models.Api.OneOneFive.File;
-using Display.Models.Dto.OneOneFive;
 using Display.Models.Enums.OneOneFive;
 using Display.Providers;
 using Microsoft.UI.Xaml.Data;
 using SharpCompress;
 
-namespace Display.Models.Data.IncrementalCollection;
+namespace Display.Models.Vo.IncrementalCollection;
 
 public class IncrementalLoadFailDatumInfoCollection : ObservableCollection<Datum>, ISupportIncrementalLoading
 {
@@ -47,17 +46,15 @@ public void SetOrder(string orderBy, bool isDesc)
     public async Task LoadData(int startShowCount = 20)
     {
         var newItems = await DataAccess.Get.GetFailFileInfoWithDatum(0, startShowCount, FilterName, OrderBy, IsDesc, ShowType);
-
         if (Count == 0)
         {
-            HasMoreItems = true;
             AllCount = DataAccess.Get.GetCountOfFailDatumFiles(FilterName, ShowType);
         }
         else
             Clear();
 
-
         newItems?.ForEach(Add);
+        HasMoreItems = true;
     }
 
     private async Task<LoadMoreItemsResult> InnerLoadMoreItemsAsync(uint count)

diff --git a/Display/ViewModels/ImageViewModel.cs b/Display/ViewModels/ImageViewModel.cs
@@ -50,7 +50,6 @@ public async Task SetDataAndCurrentIndex(List<FilesInfo> files, int currentIndex
             subImageViewModels.Add(photoViewModel);
         }
 
-        //Photos = new ObservableCollection<Models.Image.SubImageModel>(subImageViewModels);
         Photos = subImageViewModels;
 
         await LoadImage();

diff --git a/Display/Views/Pages/More/DatumList/FileListPage.xaml b/Display/Views/Pages/More/DatumList/FileListPage.xaml
@@ -11,9 +11,7 @@
       xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
       xmlns:userController="using:Display.Controls.UserController"
       xmlns:enums1="using:Display.Models.Enums"
-      xmlns:oneOneFive="using:Display.Models.Dto.OneOneFive"
       xmlns:datumList="using:Display.Views.Pages.More.DatumList"
-      xmlns:file="using:Display.Models.Api.OneOneFive.File"
       xmlns:oneOneFive1="using:Display.Models.Vo.OneOneFive"
       xmlns:vo="using:Display.Models.Vo"
       mc:Ignorable="d">
@@ -222,6 +220,8 @@
                     Value="0.5" />
             <Setter Property="Padding"
                     Value="0,10,0,0" />
+            <Setter Property="BorderBrush"
+                    Value="{ThemeResource ControlElevationBorderBrush}" />
             <Setter Property="RowSpacing"
                     Value="5" />
             <Setter Property="HorizontalAlignment"

diff --git a/Display/Views/Pages/VideoViewPage.xaml b/Display/Views/Pages/VideoViewPage.xaml
@@ -2,16 +2,13 @@
     x:Class="Display.Views.Pages.VideoViewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Display.Controls"
-    xmlns:local="using:Display.Views"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:data="using:Display.Models.Data"
     xmlns:providers="using:Display.Providers"
     xmlns:userController="using:Display.Controls.UserController"
     mc:Ignorable="d">
 
-    <userController:VideoCoverDisplay x:Name="videoControl"
+    <userController:VideoCoverDisplay x:Name="VideoControl"
         MoreButtonClick="{x:Bind OnClicked}"
         VideoPlayClick="{x:Bind VideoPlay_Click}"
         SingleVideoPlayClick="SingleVideoPlay_Click"

diff --git a/Display/Views/Pages/VideoViewPage.xaml.cs b/Display/Views/Pages/VideoViewPage.xaml.cs
@@ -112,11 +112,11 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             if (_storeditem != null)
             {
                 //开始动画
-                videoControl.StartAnimation(animation, _storeditem);
+                VideoControl.StartAnimation(animation, _storeditem);
             }
             else
             {
-                animation.TryStart(videoControl.PageShow_Grid);
+                animation.TryStart(VideoControl.PageShow_Grid);
             }
         }
     }