finish task and publish 0.5.5.0 version

Gaoyifei1011 · Sep 24, 2022 · 133e8dc · 133e8dc
1 parent fac6d7c
commit 133e8dc
Show file tree

Hide file tree

Showing 53 changed files with 730 additions and 310 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -36,16 +36,18 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 
 | Project progress                                         | Development progress                                                                                               |
 | ---------------------------------------------------------| -------------------------------------------------------------------------------------------------------------------|
-| Main page functionality                                  | Completed, the download interface is being implemented, and it can be docked after the implementation is completed |
+| Main page functionality                                  | Completed                                                                                                          |
 | History (records used links)                             | Completed                                                                                                          |
 | Download the file from the generated link                | Completed (in beta)                                                                                                |
-| Deploy the app offline after the download is complete    | Developed not yet                                                                                                  |
-| Console applications (quickly download and deploy)       | Planning                                                                                                           |
-| Access the web version of the docking download interface | Planning                                                                                                           |
-| Program performance optimization                         | Developed not yet                                                                                                  |
+| Deploy the app offline after the download is complete    | Completed                                                                                                          |
+| Console applications (quickly download and deploy)       | Planning (Expected 0.6.0 preview implementation)                                                                   |
+| Access the web version of the docking download interface | Planning (Expected 0.7.0 preview implementation)                                                                   |
+| Program performance optimization                         | Planning (Expected to be implemented in version 1.0.0)                                                             |
 
 > * At present, the application is in the development stage, some functions have not yet been implemented, and only basic functions are currently provided. In addition, 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.
 > * The download function is in the testing stage, there may be instability during use, if there is an abnormality during use, please use a browser to download.
+> * When you open the app for the first time, a Windows Security Center alert window will pop up, asking you to allow getstoreapparia2.exe to communicate on private and public networks for quick app download.
+
 ------
 
 ### Project References (Sort by alphabetical order)
@@ -54,6 +56,7 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 > * [Aria2.NET](https://github.com/rogerfar/Aria2.NET)&emsp;
 > * [CommunityToolkit.Mvvm](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [CommunityToolkit.WinUI.Notifications](https://www.nuget.org/packages/CommunityToolkit.WinUI.Notifications)&emsp;
+> * [CommunityToolkit.WinUI.UI.Behaviors](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [CommunityToolkit.WinUI.UI.Controls](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [HtmlAgilityPack](http://html-agility-pack.net)&emsp;
 > * [Microsoft.Data.Sqlite](https://docs.microsoft.com/dotnet/standard/data/sqlite)&emsp;
@@ -62,7 +65,6 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 > * [Microsoft.Windows.SDK.BuildTools](https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Microsoft.Xaml.Behaviors.WinUI.Managed](https://www.nuget.org/packages/Microsoft.Xaml.Behaviors.WinUI.Managed)&emsp;
-> * [NETStandard.Library](https://www.nuget.org/packages/NETStandard.Library)&emsp;
 > * [PInvoke.SHCore](https://github.com/dotnet/pinvoke)&emsp;
 > * [System.Management](https://www.nuget.org/packages/System.Management)&emsp;
 > * [Template Studio](https://github.com/microsoft/TemplateStudio)&emsp;

diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -36,16 +36,17 @@
 
 | 项目内容                        | 开发进展                                          |
 | --------------------------------| --------------------------------------------------|
-| 主页面功能                      | 已完成，下载接口正在实现中，实现完成后即可对接    |
+| 主页面功能                      | 已完成                                            |
 | 历史记录（记录使用过的链接）    | 已完成                                            |
 | 通过生成的链接下载文件          | 已完成（处于测试阶段）                            |
-| 下载完成后离线部署应用          | 尚未开发                                          |
-| 控制台应用程序（快速下载并部署）| 计划中                                            |
-| 访问网页版对接下载接口          | 计划中                                            |
-| 程序性能优化                    | 尚未开发                                          |
+| 下载完成后离线部署应用          | 已完成                                            |
+| 控制台应用程序（快速下载并部署）| 计划中（预计0.6.0预览版本实现）                   |
+| 访问网页版对接下载接口          | 计划中（预计0.7.0预览版本实现）                   |
+| 程序性能优化                    | 计划中（预计1.0.0正式版本实现）                   |
 
 > * 目前该应用处于开发阶段，有部分功能尚未实现，目前仅提供基础的功能。此外我是c#的初学者，且本人时间较为紧张，只能利用自己的闲余时间开发，开发进度较为缓慢，请谅解。
 > * 下载功能处于测试阶段，在使用过程中可能存在不稳定现象，如果在使用过程中出现异常，请使用浏览器下载。
+> * 初次打开应用时，会弹出Windows 安全中心警报的窗口，请您允许getstoreapparia2.exe在专用网络和公用网络中通信，方便快速下载应用。
 
 ------
 
@@ -55,6 +56,7 @@
 > * [Aria2.NET](https://github.com/rogerfar/Aria2.NET)&emsp;
 > * [CommunityToolkit.Mvvm](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [CommunityToolkit.WinUI.Notifications](https://www.nuget.org/packages/CommunityToolkit.WinUI.Notifications)&emsp;
+> * [CommunityToolkit.WinUI.UI.Behaviors](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [CommunityToolkit.WinUI.UI.Controls](https://github.com/CommunityToolkit/WindowsCommunityToolkit)&emsp;
 > * [HtmlAgilityPack](http://html-agility-pack.net)&emsp;
 > * [Microsoft.Data.Sqlite](https://docs.microsoft.com/dotnet/standard/data/sqlite)&emsp;
@@ -63,7 +65,6 @@
 > * [Microsoft.Windows.SDK.BuildTools](https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Microsoft.Xaml.Behaviors.WinUI.Managed](https://www.nuget.org/packages/Microsoft.Xaml.Behaviors.WinUI.Managed)&emsp;
-> * [NETStandard.Library](https://www.nuget.org/packages/NETStandard.Library)&emsp;
 > * [PInvoke.SHCore](https://github.com/dotnet/pinvoke)&emsp;
 > * [System.Management](https://www.nuget.org/packages/System.Management)&emsp;
 > * [Template Studio](https://github.com/microsoft/TemplateStudio)&emsp;

diff --git a/GetStoreApp.sln b/GetStoreApp.sln
@@ -27,56 +27,40 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetStoreAppConsole", "GetSt
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|Any CPU.Build.0 = Debug|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|x64.ActiveCfg = Debug|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|x64.Build.0 = Debug|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|x86.ActiveCfg = Debug|x86
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Debug|x86.Build.0 = Debug|x86
-		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|Any CPU.ActiveCfg = Release|x64
-		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|Any CPU.Build.0 = Release|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|x64.ActiveCfg = Release|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|x64.Build.0 = Release|x64
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|x86.ActiveCfg = Release|x86
 		{C10E0E75-FF6C-4976-BCEE-0369B3FCAA8E}.Release|x86.Build.0 = Release|x86
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|Any CPU.Build.0 = Debug|x64
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x64.ActiveCfg = Debug|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x64.Build.0 = Debug|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x64.Deploy.0 = Debug|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x86.ActiveCfg = Debug|x86
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x86.Build.0 = Debug|x86
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Debug|x86.Deploy.0 = Debug|x86
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|Any CPU.ActiveCfg = Release|x64
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|Any CPU.Build.0 = Release|x64
-		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|Any CPU.Deploy.0 = Release|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x64.ActiveCfg = Release|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x64.Build.0 = Release|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x64.Deploy.0 = Release|x64
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x86.ActiveCfg = Release|x86
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x86.Build.0 = Release|x86
 		{CA6C2DC4-C96D-4C23-AE18-FC7150BEF554}.Release|x86.Deploy.0 = Release|x86
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x64.Build.0 = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x86.Build.0 = Debug|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x64.ActiveCfg = Release|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x64.Build.0 = Release|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x86.ActiveCfg = Release|Any CPU
-		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x86.Build.0 = Release|Any CPU
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x64.ActiveCfg = Debug|x64
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x64.Build.0 = Debug|x64
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x86.ActiveCfg = Debug|x86
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Debug|x86.Build.0 = Debug|x86
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x64.ActiveCfg = Release|x64
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x64.Build.0 = Release|x64
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x86.ActiveCfg = Release|x86
+		{FBEA88AF-660F-404A-BC06-C21FD14DBAFA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/GetStoreApp/App.xaml.cs b/GetStoreApp/App.xaml.cs
@@ -29,7 +29,7 @@ public App()
         {
             InitializeComponent();
 
-            IOCHelper.InitializeIOCService();
+            IOCHelper.InitializeService();
 
             ActivationService = IOCHelper.GetService<IActivationService>();
             ResourceService = IOCHelper.GetService<IResourceService>();

diff --git a/GetStoreApp/Aria2/X64/GetStoreAppAria2.exe b/GetStoreApp/Aria2/X64/GetStoreAppAria2.exe
diff --git a/GetStoreApp/Contracts/Services/Download/IDownloadDBService.cs b/GetStoreApp/Contracts/Services/Download/IDownloadDBService.cs
@@ -22,7 +22,7 @@ public interface IDownloadDBService
 
         Task<bool> DeleteAsync(string downloadKey);
 
-        Task<bool> DeleteSelectedAsync(List<string> selectedDownloadKeyList);
+        Task<bool> DeleteSelectedAsync(List<BackgroundModel> selectedDownloadList);
 
         Task<bool> ClearAsync();
     }

diff --git a/GetStoreApp/Contracts/Services/Settings/ILanguageService.cs b/GetStoreApp/Contracts/Services/Settings/ILanguageService.cs
@@ -15,7 +15,5 @@ public interface ILanguageService
         Task InitializeLanguageAsync();
 
         Task SetLanguageAsync(LanguageModel language);
-
-        Task SetAppLanguageAsync();
     }
 }
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -11,8 +11,8 @@
     <PackageCertificateThumbprint>7F64DB0B0770C29C61E5F8DC60430B3DC390D99F</PackageCertificateThumbprint>
     <WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>
     <ApplicationIcon>Assets\Logo\GetStoreApp.ico</ApplicationIcon>
-    <Version>0.5.0.0</Version>
-    <FileVersion>0.5.0.0</FileVersion>
+    <Version>0.5.5.0</Version>
+    <FileVersion>0.5.5.0</FileVersion>
     <Copyright>高怡飞</Copyright>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
@@ -79,7 +79,8 @@
     <None Remove="UI\Dialogs\CloudflareValidationDialog.xaml" />
     <None Remove="UI\Dialogs\DeletePromptDialog.xaml" />
     <None Remove="UI\Dialogs\DesktopAppsDialog.xaml" />
-    <None Remove="UI\Dialogs\DownloadNotificationDialog.xaml" />
+    <None Remove="UI\Dialogs\DownloadNotifyDialog.xaml" />
+    <None Remove="UI\Dialogs\InstallingNotifyDialog.xaml" />
     <None Remove="UI\Dialogs\RestartAppsDialog.xaml" />
     <None Remove="UI\Dialogs\SelectEmptyPromptDialog.xaml" />
     <None Remove="UI\Dialogs\TraceCleanupPromptDialog.xaml" />
@@ -255,7 +256,10 @@
     <Page Update="UI\Dialogs\DesktopAppsDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="UI\Dialogs\DownloadNotificationDialog.xaml">
+    <Page Update="UI\Dialogs\DownloadNotifyDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="UI\Dialogs\InstallingNotifyDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Update="UI\Dialogs\RestartAppsDialog.xaml">

diff --git a/GetStoreApp/Helpers/IOCHelper.cs b/GetStoreApp/Helpers/IOCHelper.cs
@@ -50,7 +50,7 @@ public static T GetService<T>() where T : class
             return service;
         }
 
-        public static void InitializeIOCService()
+        public static void InitializeService()
         {
             Host = Microsoft.Extensions.Hosting.Host.
             CreateDefaultBuilder().

diff --git a/GetStoreApp/Models/Download/BackgroundModel.cs b/GetStoreApp/Models/Download/BackgroundModel.cs
@@ -51,5 +51,10 @@ public class BackgroundModel
         /// 文件下载速度
         /// </summary>
         public double CurrentSpeed { get; set; }
+
+        /// <summary>
+        /// 文件是否处于正在安装状态
+        /// </summary>
+        public bool IsInstalling { get; set; }
     }
 }
diff --git a/GetStoreApp/Models/History/HistoryModel.cs b/GetStoreApp/Models/History/HistoryModel.cs
@@ -85,13 +85,5 @@ public string HistoryLink
         // Using a DependencyProperty as the backing store for HistoryLink.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty HistoryLinkProperty =
             DependencyProperty.Register("HistoryLink", typeof(string), typeof(HistoryModel), new PropertyMetadata(string.Empty));
-
-        /// <summary>
-        /// 按时间升序排列
-        /// </summary>
-        public int CompareTo(HistoryModel other)
-        {
-            return CreateTimeStamp.CompareTo(other.CreateTimeStamp);
-        }
     }
 }
diff --git a/GetStoreApp/Services/Download/DownloadDBService.cs b/GetStoreApp/Services/Download/DownloadDBService.cs
@@ -342,7 +342,7 @@ public async Task<bool> DeleteAsync(string downloadKey)
         /// <summary>
         /// 删除选定的下载记录数据
         /// </summary>
-        public async Task<bool> DeleteSelectedAsync(List<string> selectedDownloadKeyList)
+        public async Task<bool> DeleteSelectedAsync(List<BackgroundModel> selectedDownloadList)
         {
             bool IsDeleteSuccessfully = true;
 
@@ -359,11 +359,11 @@ public async Task<bool> DeleteSelectedAsync(List<string> selectedDownloadKeyList
 
                         try
                         {
-                            foreach (string downloadKey in selectedDownloadKeyList)
+                            foreach (BackgroundModel backgroundItem in selectedDownloadList)
                             {
                                 DeleteCommand.CommandText = string.Format("DELETE FROM {0} WHERE DOWNLOADKEY = '{1}'",
                                     DataBaseService.DownloadTableName,
-                                    downloadKey
+                                    backgroundItem.DownloadKey
                                     );
                                 await DeleteCommand.ExecuteNonQueryAsync();
                             }

diff --git a/GetStoreApp/Services/Root/ActivationService.cs b/GetStoreApp/Services/Root/ActivationService.cs
@@ -87,7 +87,6 @@ private async Task InitializeAsync()
         {
             // 初始化应用资源及应用使用的语言信息
             await LanguageService.InitializeLanguageAsync();
-            await LanguageService.SetAppLanguageAsync();
             await ResourceService.InitializeResourceAsync(LanguageService.DefaultAppLanguage, LanguageService.AppLanguage);
 
             // 初始化数据库信息

diff --git a/GetStoreApp/Services/Root/AppNotificationService.cs b/GetStoreApp/Services/Root/AppNotificationService.cs
@@ -170,8 +170,22 @@ public void Show(string notificationKey, params string[] notificationContent)
                 // 安装应用显示相应的通知
                 case "InstallApp":
                     {
-                        //new ToastContentBuilder().AddArgument("AppNotifications", notificationKey)
-                        //    .AddText(Resource);
+                        if (notificationContent.Length == 0)
+                        {
+                            return;
+                        }
+
+                        // 成功安装应用通知
+                        if (notificationContent[0] == "Successfully")
+                        {
+                            new ToastContentBuilder().AddText(string.Format(ResourceService.GetLocalized("/Notification/InstallSuccessfully"), notificationContent[1])).Show();
+                        }
+                        else if (notificationContent[0] == "Error")
+                        {
+                            new ToastContentBuilder().AddText(string.Format(ResourceService.GetLocalized("/Notification/InstallError"), notificationContent[1]))
+                                .AddText(string.Format(ResourceService.GetLocalized("/Notification/InstallErrorDescription"), notificationContent[2]))
+                                .Show();
+                        }
                         break;
                     }
                 default: