Final Stable Release

Gaoyifei1011 · Jan 18, 2023 · 58e6056 · 58e6056
1 parent d5830a3
commit 58e6056
Show file tree

Hide file tree

Showing 20 changed files with 135 additions and 71 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -19,16 +19,16 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 ### Screenshot of the app
 
 #### <p align="center">The app successfully gets the interface</p>
-![image](https://user-images.githubusercontent.com/49179966/190880888-ecba0107-3d5a-4b16-a3ec-e47eb7f9f166.png)
-#### <p align="center">History Records</p>
-![image](https://user-images.githubusercontent.com/49179966/190880874-bdbd173d-333e-4409-af1c-e3fe9d596bb5.png)
-#### <p align="center">Download Page</p>
-![image](https://user-images.githubusercontent.com/49179966/190881022-38955a18-fa97-4ba2-ad43-a57c2cc9d383.png)
-![image](https://user-images.githubusercontent.com/49179966/190881042-78c3facc-4d10-48e8-b631-7c59427cea43.png)
-#### <p align="center">Web Page</p>
-![image](https://user-images.githubusercontent.com/49179966/190880867-2a96f02c-9073-4179-8689-32dd1aeef507.png)
+![image](https://user-images.githubusercontent.com/49179966/213074717-14e491c7-bdf9-4bfd-a156-f9ba7d041bcd.png)
+#### <p align="center">History Record</p>
+![image](https://user-images.githubusercontent.com/49179966/213074809-7097acca-0403-42de-8c6b-b843b068f252.png)
+#### <p align="center">Download Management</p>
+![image](https://user-images.githubusercontent.com/49179966/213075014-8141a1ca-c589-43c1-ab6d-68dd5215feea.png)
+![image](https://user-images.githubusercontent.com/49179966/213075091-bd934848-12ce-4d25-b7a8-e0e7a32334d5.png)
+#### <p align="center">Access Webpage</p>
+![image](https://user-images.githubusercontent.com/49179966/213075241-5ee74c5b-303e-452e-8b06-64b683e86f2e.png)
 #### <p align="center">Application Descriptions</p>
-![image](https://user-images.githubusercontent.com/49179966/190881054-4d6c5d5b-2bbc-4d51-a98e-5adcc3d5a5eb.png)
+![image](https://user-images.githubusercontent.com/49179966/213076832-3010fa9b-73eb-4f99-a974-e4b2c915d5b0.png)
 
 ------
 
@@ -42,19 +42,21 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 | Deploy the app offline after the download is complete    | Completed                                                                                                          |
 | Access the web version of the docking download interface | Completed                                                                                                          |
 | Console applications (quickly download)                  | Completed                                                                                                          |
-| Program performance optimization                         | Planning (Expected to be implemented in version 1.0.0)                                                             |
+| Program performance optimization                         | Completed                                                                                                          |
 
-> * I am a beginner in C#, and I am more time-constrained, I can only use my spare time to develop, the development progress is relatively slow, please understand.
+All the content of the program has been developed
 
 ------
 
 ### Project References (Sort by alphabetical order)
 
 > * [Aira2](https://aria2.github.io)&emsp;
 > * [Microsoft.Data.Sqlite.Core](https://docs.microsoft.com/dotnet/standard/data/sqlite)&emsp;
-> * [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
-> * [SQLitePCLRaw.bundle_winsqlite3](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+> * [SQLitePCLRaw.core](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+> * [SQLitePCLRaw.provider.winsqlite3](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+
+[Code referenced or used during the learning process](https://github.com/Gaoyifei1011/GetStoreApp/blob/master/Description/StudyReferenceCode.md)&emsp;
 
 ------
 
@@ -73,7 +75,7 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 #### <p align="center">Tools that must be installed</p>
 
 > * [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/) 
-> * . NET Desktop Development (Installed in Visual Studio Installer, .NET SDK Version 6.0)
+> * . NET Desktop Development (Installed in Visual Studio Installer, .NET SDK Version 7.0)
 > * [Microsoft Edge WebView2 Runtime](https://developer.microsoft.com/zh-cn/microsoft-edge/webview2/) £¨install recommendedly£©
 
 #### <p align="center">Compilation steps</p>
@@ -93,12 +95,21 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 > * README_ (corresponding language).The language screenshot added in the md file is replaced with the app screenshot in the language you are familiar with.
 > * Complete the translation steps described above to ensure that all steps run smoothly.
 > * Open the GetStoreAppPackage packaging project, find the Package.appxmanifest file, right-click the file, click View Code, find the Sources tab, and add the corresponding language according to the template, such as "<Resource Language="EN-US"/>".
-> * Open the Strings folder of the project and create the language you are using, for example ( English (United States) folder name is en-us , you can refer to the Table of Indicating Language (Culture) Codes and Countries and Regions)
+> * Open the Strings folder of the GetStoreApp project and create the language you are using, for example ( English (United States) folder name is en-us , you can refer to the Table of Indicating Language (Culture) Codes and Countries and Regions)
 > * Open the resw file under the subfolder and translate each name.
 > * Compile and run the code and test your language, when the application is first opened if there is no language you use to display English (United States) by default, it needs to be dynamically adjusted in the settings.
 > * Create a PR after completing the above steps, then submit the modified content to this project and wait for the merge.
 
 ------
 
-## Trend chart of project Star quantity statistics
+### Thanks (Sort by alphabetical order)
+
+> * [AndromedaMelody](https://github.com/AndromedaMelody)&emsp;
+> * [·ÉÏè](https://fionlen.azurewebsites.net)&emsp;
+> * [MouriNaruto](https://github.com/MouriNaruto)&emsp;
+> * [TaylorShi](https://github.com/TaylorShi)&emsp;
+
+------
+
+### Trend chart of project Star quantity statistics
 [![Stargazers over time](https://starchart.cc/Gaoyifei1011/GetStoreApp.svg)](https://starchart.cc/Gaoyifei1011/GetStoreApp)
diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -19,16 +19,16 @@
 ### 应用截图
 
 #### <p align="center">应用成功获取界面</p>
-![image](https://user-images.githubusercontent.com/49179966/190880785-3df61d85-2134-41c1-bb94-6cd9a91cf1e5.png)
+![image](https://user-images.githubusercontent.com/49179966/213072610-b0acba12-bb60-43cb-b5b1-a0270cd3b7f1.png)
 #### <p align="center">历史记录</p>
-![image](https://user-images.githubusercontent.com/49179966/190880908-fe88b95f-28e9-4081-8ad0-95fbf8b36295.png)
-#### <p align="center">下载界面</p>
-![image](https://user-images.githubusercontent.com/49179966/190880969-07aba750-0c0a-474b-ab73-69176c25145e.png)
-![image](https://user-images.githubusercontent.com/49179966/190880987-71946b4e-6267-4315-b0e7-a68349ff1f56.png)
-#### <p align="center">网页界面</p>
-![image](https://user-images.githubusercontent.com/49179966/190880935-c4efdcbf-f8ef-44e3-906b-27357be25795.png)
+![image](https://user-images.githubusercontent.com/49179966/213072877-d1be2dc7-f351-4607-809d-f23134b18ca9.png)
+#### <p align="center">下载管理</p>
+![image](https://user-images.githubusercontent.com/49179966/213073804-83c985f2-4917-4b5f-8c3b-f49c94b8c5a1.png)
+![image](https://user-images.githubusercontent.com/49179966/213074001-02fca36d-65a1-493f-abf1-0b087e51e2fc.png)
+#### <p align="center">访问网页版</p>
+![image](https://user-images.githubusercontent.com/49179966/213074325-54989cde-4a2e-4876-8c31-67532d0614f9.png)
 #### <p align="center">应用说明</p>
-![image](https://user-images.githubusercontent.com/49179966/190880798-eb849860-589b-4f24-9112-09514cfd1964.png)
+![image](https://user-images.githubusercontent.com/49179966/213076697-4a3e45f1-3474-4fde-8f72-06a0fc79b65c.png)
 
 ------
 
@@ -42,19 +42,21 @@
 | 下载完成后离线部署应用          | 已完成                                            |
 | 访问网页版对接下载接口          | 已完成                                            |
 | 控制台应用程序（快速下载）      | 已完成                                            |
-| 程序性能优化                    | 计划中（预计1.0.0正式版本实现）                   |
+| 程序性能优化                    | 已完成                                            |
 
-> * 我是c#的初学者，且本人时间较为紧张，只能利用自己的闲余时间开发，开发进度较为缓慢，请谅解。
+程序所有功能都已开发完成
 
 ------
 
 ### 项目引用（按英文首字母排序）
 
 > * [Aira2](https://aria2.github.io)&emsp;
 > * [Microsoft.Data.Sqlite.Core](https://docs.microsoft.com/dotnet/standard/data/sqlite)&emsp;
-> * [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
-> * [SQLitePCLRaw.bundle_winsqlite3](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+> * [SQLitePCLRaw.core](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+> * [SQLitePCLRaw.provider.winsqlite3](https://github.com/ericsink/SQLitePCL.raw)&emsp;
+
+[学习过程中参考或使用的代码](https://github.com/Gaoyifei1011/GetStoreApp/blob/master/Description/StudyReferenceCode.md)&emsp;
 
 ------
 
@@ -73,7 +75,7 @@
 #### <p align="center">必须安装的工具</p>
 
 > * [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/) 
-> * .NET桌面开发（Visual Studio Installer中安装，.NET SDK 版本 6.0）
+> * .NET桌面开发（Visual Studio Installer中安装，.NET SDK 版本 7.0）
 > * [Microsoft Edge WebView2 运行时](https://developer.microsoft.com/zh-cn/microsoft-edge/webview2/) （推荐安装）
 
 #### <p align="center">编译步骤</p>
@@ -93,12 +95,21 @@
 > * README_(对应的语言).md文件中添加的语言截图替换为您熟悉的语言的应用截图。
 > * 完成上面所述的翻译步骤，确保所有步骤能够顺利运行。
 > * 打开GetStoreAppPackage打包项目，找到Package.appxmanifest文件，右键该文件，点击查看代码，找到Resources标签，根据模板添加相对应的语言，例如“<Resource Language="EN-US"/>”。
-> * 打开项目的Strings文件夹，并创建您使用的语言，比如（English(United States)）文件夹名称为en-us，具体可以参考表示语言(文化)代码与国家地区对照表）。
+> * 打开GetStoreApp项目的Strings文件夹，并创建您使用的语言，比如（English(United States)）文件夹名称为en-us，具体可以参考表示语言(文化)代码与国家地区对照表）。
 > * 打开子文件夹下的resw文件，对每一个名称进行翻译。
 > * 编译运行代码并测试您的语言，应用在初次打开的时候如果没有您使用的语言默认显示English(United States)，需要在设置中动态调整。
 > * 完成上述步骤后创建PR，然后将修改的内容提交到本项目，等待合并即可。
 
 ------
 
-## 项目 Star 数量统计趋势图
+### 感谢（按英文首字母排序）
+
+> * [AndromedaMelody](https://github.com/AndromedaMelody)&emsp;
+> * [飞翔](https://fionlen.azurewebsites.net)&emsp;
+> * [MouriNaruto](https://github.com/MouriNaruto)&emsp;
+> * [TaylorShi](https://github.com/TaylorShi)&emsp;
+
+------
+
+### 项目 Star 数量统计趋势图
 [![Stargazers over time](https://starchart.cc/Gaoyifei1011/GetStoreApp.svg)](https://starchart.cc/Gaoyifei1011/GetStoreApp)
diff --git a/Description/StudyReferenceCode.md b/Description/StudyReferenceCode.md
@@ -0,0 +1,17 @@
+### <p align="center">学习过程中参考或使用的代码</p>
+### <p align="center">Code referenced or used during the learning process</p>
+
+------
+
+> * [Community Toolkit](https://github.com/CommunityToolkit/dotnet)&emsp;
+> * [Desktop Window](https://github.com/marb2000/DesktopWindow)&emsp;
+> * [Hardcodet NotifyIcon for WPF](https://github.com/hardcodet/wpf-notifyicon)&emsp;
+> * [IFileDialog](https://github.com/shigobu/IFileDialog)&emsp;
+> * [Microsoft Windows API Codepack](https://github.com/Wagnerp/Windows-API-CodePack-NET)&emsp;
+> * [MVVMLight.Messenger](https://github.com/TqrHsn/MVVMLight.Messenger)&emsp;
+> * [NanaGet](https://github.com/M2Team/NanaGet)&emsp;
+> * [NotifyList](https://blog.csdn.net/chinaherolts2008/article/details/115058859)&emsp;
+> * [Null.ConsoleEx](https://github.com/SlimeNull/Null.ConsoleEx)&emsp;
+> * [P/Invoke](https://github.com/dotnet/pinvoke)&emsp;
+> * [TaskbarManager](https://blog.csdn.net/weixin_30521161/article/details/96964128)&emsp;
+> * [YDKK.Windows.NotifyIcon](https://github.com/YDKK/YDKK.Windows.NotifyIcon)&emsp;
diff --git a/GetStoreApp.sln b/GetStoreApp.sln
@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Description", "Description"
 	ProjectSection(SolutionItems) = preProject
 		Description\README_EN-US.md = Description\README_EN-US.md
 		Description\README_ZH-CN.md = Description\README_ZH-CN.md
+		Description\StudyReferenceCode.md = Description\StudyReferenceCode.md
 	EndProjectSection
 EndProject
 Global

diff --git a/GetStoreApp/LICENSE → GetStoreApp/Assets/LICENSE b/GetStoreApp/LICENSE → GetStoreApp/Assets/LICENSE
diff --git a/GetStoreApp/Converters/Formats/GMTFormatConverter.cs b/GetStoreApp/Converters/Formats/GMTFormatConverter.cs
@@ -24,7 +24,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
-            throw new NotImplementedException();
+            return default;
         }
     }
 }
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -13,8 +13,9 @@
     <DesktopCompatible>true</DesktopCompatible>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
     <FileAlignment>512</FileAlignment>
-    <FileVersion>0.8.5.0</FileVersion>
+    <FileVersion>1.0.120.0</FileVersion>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
     <IncludeSymbols>False</IncludeSymbols>
     <ImplicitUsings>disable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
@@ -36,7 +37,7 @@
     <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
-    <Version>0.8.5.0</Version>
+    <Version>1.0.120.0</Version>
     <UseWindowsForms>False</UseWindowsForms>
     <UseWinUI>true</UseWinUI>
     <UseWPF>False</UseWPF>
@@ -131,16 +132,16 @@
     </Content>
     <Content Update="Assets\Images\DesktopApps.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\LICENSE">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>    
     <Content Include="Fonts\Segoe Fluent Icons.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Fonts\Settings Fluent Icons.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="LICENSE">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
 
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
@@ -151,12 +152,11 @@
 
     <None Remove="Assets\GetStoreApp.png" />
     <None Remove="Assets\Images\CloudflareValidation.png" />
+    <None Remove="Assets\LICENSE" />
 
     <None Remove="Fonts\Segoe Fluent Icons.ttf" />
     <None Remove="Fonts\Settings Fluent Icons.ttf" />
 
-    <None Remove="LICENSE" />
-
     <None Remove="Styles\Button.xaml" />
     <None Remove="Styles\Checkbox.xaml" />
     <None Remove="Styles\CommandBar.xaml" />
@@ -262,14 +262,11 @@
     <None Remove="Views\Pages\WebPage.xaml" />
 
     <None Remove="Views\Window\MainWindow.xaml" />
+
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
-    <PackageReference Include="SQLitePCLRaw.bundle_winsqlite3" Version="2.1.4">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
+    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.provider.winsqlite3" Version="2.1.4" />
 
     <Page Update="Styles\Button.xaml">
       <Generator>MSBuild:Compile</Generator>

diff --git a/GetStoreApp/Program.cs b/GetStoreApp/Program.cs
@@ -62,7 +62,7 @@ public static void Main(string[] args)
                 });
             }
 
-            // 以控制台方式启动程序
+            // 以控制台程序方式启动
             else
             {
                 bool AttachResult = Kernel32Library.AttachConsole();
@@ -73,7 +73,7 @@ public static void Main(string[] args)
                 ConsoleLaunchService.InitializeConsoleStartupAsync().Wait();
 
                 Kernel32Library.FreeConsole();
-
+                
                 // 退出应用程序
                 Environment.Exit(Convert.ToInt32(AppExitCode.Successfully));
             }

diff --git a/GetStoreApp/Services/Controls/Download/DownloadSchedulerService.cs b/GetStoreApp/Services/Controls/Download/DownloadSchedulerService.cs
@@ -66,6 +66,7 @@ public static async Task CloseDownloadSchedulerAsync()
         {
             DownloadSchedulerTimer.Stop();
             DownloadSchedulerTimer.Elapsed -= DownloadSchedulerTimerElapsed;
+            DownloadSchedulerTimer.Dispose();
 
             await Task.CompletedTask;
         }

diff --git a/GetStoreApp/Services/Controls/Settings/Appearance/AlwaysShowBackdropService.cs b/GetStoreApp/Services/Controls/Settings/Appearance/AlwaysShowBackdropService.cs
@@ -34,7 +34,7 @@ private static async Task<bool> GetAlwaysShowBackdropValueAsync()
             {
                 return DefaultAlwaysShowBackdropValue;
             }
-
+            
             return alwaysShowBackdropValue.Value;
         }
 

diff --git a/GetStoreApp/Services/Root/DatabaseService.cs b/GetStoreApp/Services/Root/DatabaseService.cs
@@ -1,4 +1,5 @@
 using Microsoft.Data.Sqlite;
+using SQLitePCL;
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -27,6 +28,9 @@ public static async Task InitializeDataBaseAsync()
             // 创建数据库文件
             await ApplicationData.Current.LocalFolder.CreateFileAsync(DBName, CreationCollisionOption.OpenIfExists);
 
+            // 使用自定义Sqlite版本
+            raw.SetProvider(new SQLite3Provider_winsqlite3());
+
             // 初始化历史记录表
             await InitializeHistoryTableAsync();
 

diff --git a/GetStoreApp/Services/Shell/DownloadService.cs b/GetStoreApp/Services/Shell/DownloadService.cs
@@ -30,9 +30,10 @@ public static async Task QueryDownloadIndexAsync()
             while (true)
             {
                 Console.WriteLine(ResourceService.GetLocalized("Console/DownloadFile"));
-                List<string> IndexList = Console.ReadLine().Split(',').ToList();
+
                 try
                 {
+                    List<string> IndexList = Console.ReadLine().Split(',').ToList();
                     bool CheckResult = true;
                     foreach (string indexItem in IndexList)
                     {

diff --git a/GetStoreApp/Services/Window/NavigationService.cs b/GetStoreApp/Services/Window/NavigationService.cs
@@ -13,6 +13,8 @@ public static class NavigationService
     {
         public static Frame NavigationFrame { get; set; }
 
+        private static DrillInNavigationTransitionInfo NavigationTransition { get; } = new DrillInNavigationTransitionInfo();
+
         public static List<NavigationModel> NavigationItemList { get; set; } = new List<NavigationModel>();
 
         /// <summary>
@@ -22,7 +24,7 @@ public static void NavigateTo(Type navigationPageType)
         {
             if (NavigationItemList.Exists(item => item.NavigationPage == navigationPageType))
             {
-                NavigationFrame.Navigate(NavigationItemList.Find(item => item.NavigationPage == navigationPageType).NavigationPage, null, new DrillInNavigationTransitionInfo());
+                NavigationFrame.Navigate(NavigationItemList.Find(item => item.NavigationPage == navigationPageType).NavigationPage, null, NavigationTransition);
             }
         }