Finish task and publish 4.4.804.0 version(First AOT Version test)

Gaoyifei1011 · Aug 4, 2024 · 88d0658 · 88d0658
1 parent b911360
commit 88d0658
Show file tree

Hide file tree

Showing 22 changed files with 101 additions and 59 deletions.
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -25,7 +25,7 @@
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishSelfContained>true</PublishSelfContained>
     <PublishSingleFile>True</PublishSingleFile>
-    <PublishTrimmed>true</PublishTrimmed>
+    <PublishAot>true</PublishAot>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <RootNamespace>GetStoreApp</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
@@ -77,6 +77,7 @@
     <None Remove="Styles\WinUI\Flyout.xaml" />
     <None Remove="Styles\WinUI\HyperlinkButton.xaml" />
     <None Remove="Styles\WinUI\InfoBar.xaml" />
+    <None Remove="Styles\WinUI\ListView.xaml" />
     <None Remove="Styles\WinUI\MenuFlyout.xaml" />
     <None Remove="UI\Controls\Download\CompletedControl.xaml" />
     <None Remove="UI\Controls\Store\QueryLinksControl.xaml" />
@@ -119,6 +120,7 @@
     <Page Update="Styles\WinUI\Flyout.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="Styles\WinUI\HyperlinkButton.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="Styles\WinUI\InfoBar.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
+    <Page Update="Styles\WinUI\ListView.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="Styles\WinUI\MenuFlyout.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="UI\Controls\Download\CompletedControl.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="UI\Controls\WinGet\InstalledAppsControl.xaml" XamlRuntime="$(DefaultXamlRuntime)" />

diff --git a/GetStoreApp/GetStoreApp.res b/GetStoreApp/GetStoreApp.res
diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("4.2.804.0")]
-[assembly: AssemblyInformationalVersion("4.2.804.0")]
+[assembly: AssemblyFileVersion("4.4.804.0")]
+[assembly: AssemblyInformationalVersion("4.4.804.0")]
 [assembly: AssemblyProduct("获取商店应用")]
 [assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("4.2.804.0")]
+[assembly: AssemblyVersion("4.4.804.0")]
 
 // 应用程序默认区域性的资源控制器设置
 [assembly: NeutralResourcesLanguage("en-us")]

diff --git a/GetStoreApp/Services/Controls/Settings/LanguageService.cs b/GetStoreApp/Services/Controls/Settings/LanguageService.cs
@@ -1,9 +1,9 @@
 using GetStoreApp.Extensions.DataType.Constant;
 using GetStoreApp.Services.Root;
-using Windows.Globalization;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Windows.Globalization;
 
 namespace GetStoreApp.Services.Controls.Settings
 {

diff --git a/GetStoreApp/Styles/WinUI/ListView.xaml b/GetStoreApp/Styles/WinUI/ListView.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="CardListViewItemContainerStyle" TargetType="ListViewItem">
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="IsHoldingEnabled" Value="False" />
+        <Setter Property="Margin" Value="0,0,0,1" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <ContentPresenter
+                        x:Name="contentPresenter"
+                        Margin="{TemplateBinding Margin}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        ContentTransitions="{TemplateBinding ContentTransitions}"
+                        Style="{ThemeResource FlyoutPickerListViewItemContentPresenterStyle}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml
@@ -203,11 +203,12 @@
             TextAlignment="Center" />
     </Grid>
 
-    <ItemsView
+    <ListView
         Grid.Row="2"
         Padding="30,3,30,30"
-        IsItemInvokedEnabled="{x:Bind IsSelectMode, Mode=OneWay}"
-        ItemInvoked="{x:Bind OnItemInvoked}"
+        IsItemClickEnabled="{x:Bind IsSelectMode, Mode=OneWay}"
+        ItemClick="{x:Bind OnItemInvoked}"
+        ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
         ItemsSource="{x:Bind CompletedCollection, Mode=OneWay}"
         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
         ScrollViewer.HorizontalScrollMode="Disabled"
@@ -216,9 +217,9 @@
         SelectionMode="None"
         Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(CompletedCollection.Count), Mode=OneWay}">
 
-        <ItemsView.ItemTemplate>
+        <ListView.ItemTemplate>
             <DataTemplate x:DataType="download:CompletedModel">
-                <ItemContainer Margin="0,0,0,2">
+                <ItemContainer Margin="0,0,0,1">
                     <Grid
                         Height="66"
                         Padding="16,10"
@@ -473,6 +474,6 @@
                     </Grid>
                 </ItemContainer>
             </DataTemplate>
-        </ItemsView.ItemTemplate>
-    </ItemsView>
+        </ListView.ItemTemplate>
+    </ListView>
 </Grid>
diff --git a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs
@@ -651,9 +651,9 @@ private void OnCancelClicked(object sender, RoutedEventArgs args)
         /// <summary>
         /// 在多选模式下点击项目选择相应的条目
         /// </summary>
-        private void OnItemInvoked(object sender, ItemsViewItemInvokedEventArgs args)
+        private void OnItemInvoked(object sender, ItemClickEventArgs args)
         {
-            CompletedModel completedItem = (CompletedModel)args.InvokedItem;
+            CompletedModel completedItem = (CompletedModel)args.ClickedItem;
             int clickedIndex = CompletedCollection.IndexOf(completedItem);
 
             if (clickedIndex >= 0 && clickedIndex < CompletedCollection.Count)

diff --git a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
@@ -201,11 +201,12 @@
                 TextAlignment="Center" />
         </Grid>
 
-        <ItemsView
+        <ListView
             Grid.Row="2"
             Padding="30,3,30,30"
-            IsItemInvokedEnabled="{x:Bind IsSelectMode, Mode=OneWay}"
-            ItemInvoked="{x:Bind OnItemInvoked}"
+            IsItemClickEnabled="{x:Bind IsSelectMode, Mode=OneWay}"
+            ItemClick="{x:Bind OnItemInvoked}"
+            ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
             ItemsSource="{x:Bind DownloadingCollection, Mode=OneWay}"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
             ScrollViewer.HorizontalScrollMode="Disabled"
@@ -214,9 +215,9 @@
             SelectionMode="None"
             Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(DownloadingCollection.Count), Mode=OneWay}">
 
-            <ItemsView.ItemTemplate>
+            <ListView.ItemTemplate>
                 <DataTemplate x:DataType="download:DownloadingModel">
-                    <ItemContainer Margin="0,0,0,2">
+                    <ItemContainer Margin="0,0,0,1">
                         <Grid
                             Height="66"
                             Padding="16,12"
@@ -428,7 +429,7 @@
                         </Grid>
                     </ItemContainer>
                 </DataTemplate>
-            </ItemsView.ItemTemplate>
-        </ItemsView>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </Grid>
diff --git a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs
@@ -329,9 +329,9 @@ private void OnCancelClicked(object sender, RoutedEventArgs args)
         /// <summary>
         /// 在多选模式下点击项目选择相应的条目
         /// </summary>
-        private void OnItemInvoked(object sender, ItemsViewItemInvokedEventArgs args)
+        private void OnItemInvoked(object sender, ItemClickEventArgs args)
         {
-            DownloadingModel downloadingItem = (DownloadingModel)args.InvokedItem;
+            DownloadingModel downloadingItem = (DownloadingModel)args.ClickedItem;
             int clickedIndex = DownloadingCollection.IndexOf(downloadingItem);
 
             if (clickedIndex >= 0 && clickedIndex < DownloadingCollection.Count)

diff --git a/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml b/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml
@@ -339,9 +339,10 @@
                     TextAlignment="Center" />
             </Grid>
 
-            <ItemsView
+            <ListView
                 Grid.Row="1"
                 Padding="30,0,30,30"
+                ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
                 ItemsSource="{x:Bind UwpAppDataCollection, Mode=OneWay}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.HorizontalScrollMode="Disabled"
@@ -350,9 +351,9 @@
                 SelectionMode="None"
                 Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(UwpAppDataCollection.Count), Mode=OneWay}">
 
-                <ItemsView.ItemTemplate>
+                <ListView.ItemTemplate>
                     <DataTemplate x:DataType="uwpApp:PackageModel">
-                        <ItemContainer Margin="0,0,0,2">
+                        <ItemContainer Margin="0,0,0,1">
                             <Grid>
                                 <Grid>
                                     <Grid
@@ -568,8 +569,8 @@
                             </Grid>
                         </ItemContainer>
                     </DataTemplate>
-                </ItemsView.ItemTemplate>
-            </ItemsView>
+                </ListView.ItemTemplate>
+            </ListView>
         </Grid>
     </Grid>
 </Grid>
diff --git a/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml
@@ -244,9 +244,10 @@
                         TextAlignment="Center" />
                 </Grid>
 
-                <ItemsView
+                <ListView
                     Grid.Row="1"
                     Padding="30,0,30,30"
+                    ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
                     ItemsSource="{x:Bind InstalledAppsCollection, Mode=OneWay}"
                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                     ScrollViewer.HorizontalScrollMode="Disabled"
@@ -255,9 +256,9 @@
                     SelectionMode="None"
                     Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(InstalledAppsCollection.Count), Mode=OneWay}">
 
-                    <ItemsView.ItemTemplate>
+                    <ListView.ItemTemplate>
                         <DataTemplate x:DataType="winget:InstalledAppsModel">
-                            <ItemContainer Margin="0,0,0,2">
+                            <ItemContainer Margin="0,0,0,1">
                                 <Grid
                                     Padding="16,12"
                                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
@@ -399,8 +400,8 @@
                                 </Grid>
                             </ItemContainer>
                         </DataTemplate>
-                    </ItemsView.ItemTemplate>
-                </ItemsView>
+                    </ListView.ItemTemplate>
+                </ListView>
             </Grid>
         </Grid>
     </Grid>

diff --git a/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
@@ -209,9 +209,10 @@
                     TextAlignment="Center" />
             </Grid>
 
-            <ItemsView
+            <ListView
                 Grid.Row="1"
                 Padding="30,0,30,30"
+                ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
                 ItemsSource="{x:Bind SearchAppsCollection, Mode=OneWay}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.HorizontalScrollMode="Disabled"
@@ -220,9 +221,9 @@
                 SelectionMode="None"
                 Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(SearchAppsCollection.Count), Mode=OneWay}">
 
-                <ItemsView.ItemTemplate>
+                <ListView.ItemTemplate>
                     <DataTemplate x:DataType="winget:SearchAppsModel">
-                        <ItemContainer Margin="0,0,0,2">
+                        <ItemContainer Margin="0,0,0,1">
                             <Grid
                                 Padding="16,12"
                                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
@@ -375,8 +376,8 @@
                             </Grid>
                         </ItemContainer>
                     </DataTemplate>
-                </ItemsView.ItemTemplate>
-            </ItemsView>
+                </ListView.ItemTemplate>
+            </ListView>
         </Grid>
     </Grid>
 </Grid>
diff --git a/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
@@ -155,9 +155,10 @@
                 TextAlignment="Center" />
         </Grid>
 
-        <ItemsView
+        <ListView
             Grid.Row="1"
             Padding="30,0,30,30"
+            ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
             ItemsSource="{x:Bind UpgradableAppsCollection, Mode=OneWay}"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
             ScrollViewer.HorizontalScrollMode="Disabled"
@@ -166,9 +167,9 @@
             SelectionMode="None"
             Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(UpgradableAppsCollection.Count), Mode=OneWay}">
 
-            <ItemsView.ItemTemplate>
+            <ListView.ItemTemplate>
                 <DataTemplate x:DataType="winget:UpgradableAppsModel">
-                    <ItemContainer Margin="0,0,0,2">
+                    <ItemContainer Margin="0,0,0,1">
                         <Grid
                             Height="60"
                             Padding="16,12"
@@ -348,7 +349,7 @@
                         </Grid>
                     </ItemContainer>
                 </DataTemplate>
-            </ItemsView.ItemTemplate>
-        </ItemsView>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </Grid>
diff --git a/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs b/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs
@@ -3,7 +3,6 @@
 using GetStoreApp.Helpers.Root;
 using GetStoreApp.Services.Root;
 using GetStoreApp.UI.TeachingTips;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;

diff --git a/GetStoreApp/Views/Pages/WinGetPage.xaml b/GetStoreApp/Views/Pages/WinGetPage.xaml
@@ -154,10 +154,11 @@
                                     TextWrapping="WrapWholeWords" />
                             </Grid>
 
-                            <ItemsView
+                            <ListView
                                 Grid.Row="1"
                                 Width="450"
                                 Height="200"
+                                ItemContainerStyle="{StaticResource CardListViewItemContainerStyle}"
                                 ItemsSource="{x:Bind InstallingAppsCollection, Mode=OneWay}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.HorizontalScrollMode="Disabled"
@@ -166,9 +167,9 @@
                                 SelectionMode="None"
                                 Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(InstallingAppsCollection.Count), Mode=OneWay}">
 
-                                <ItemsView.ItemTemplate>
+                                <ListView.ItemTemplate>
                                     <DataTemplate x:DataType="model:InstallingAppsModel">
-                                        <ItemContainer Margin="0,0,0,2">
+                                        <ItemContainer Margin="0,0,0,1">
                                             <Grid
                                                 Height="60"
                                                 Margin="2,0"
@@ -344,8 +345,8 @@
                                             </Grid>
                                         </ItemContainer>
                                     </DataTemplate>
-                                </ItemsView.ItemTemplate>
-                            </ItemsView>
+                                </ListView.ItemTemplate>
+                            </ListView>
                         </Grid>
                     </Flyout>
                 </Button.Flyout>

diff --git a/GetStoreApp/WinUIApp.xaml b/GetStoreApp/WinUIApp.xaml
@@ -12,6 +12,7 @@
                 <ResourceDictionary Source="ms-appx:///Styles/WinUI/Flyout.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/WinUI/HyperlinkButton.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/WinUI/InfoBar.xaml" />
+                <ResourceDictionary Source="ms-appx:///Styles/WinUI/ListView.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/WinUI/MenuFlyout.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/WinUI/TeachingTip.xaml" />
             </ResourceDictionary.MergedDictionaries>

diff --git a/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs b/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs
@@ -17,9 +17,10 @@ public partial class DODownloadStatusCallback : IDODownloadStatusCallback
         /// </summary>
         public event Action<DODownloadStatusCallback, IDODownload, DO_DOWNLOAD_STATUS> StatusChanged;
 
-        public void OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status)
+        public int OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status)
         {
             StatusChanged?.Invoke(this, download, status);
+            return 0;
         }
     }
 }
diff --git a/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs b/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs
@@ -16,6 +16,7 @@ public partial interface IDODownloadStatusCallback
         /// <param name="download">指向其状态更改的 IDODownload 接口的指针。</param>
         /// <param name="status">指向包含下载状态 的DO_DOWNLOAD_STATUS 结构的指针。</param>
         /// <returns>如果函数成功，则返回 S_OK。 否则，它将返回 HRESULT错误代码。</returns>
-        void OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status);
+        [PreserveSig]
+        int OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status);
     }
 }