Project adjustment

Gaoyifei1011 · Aug 26, 2023 · 94a6a60 · 94a6a60
1 parent f0d3f63
commit 94a6a60
Show file tree

Hide file tree

Showing 144 changed files with 3,889 additions and 4,601 deletions.
diff --git a/GetStoreApp/App.xaml.cs b/GetStoreApp/App.xaml.cs
@@ -2,7 +2,7 @@
 using GetStoreApp.Extensions.DataType.Enums;
 using GetStoreApp.Helpers.Root;
 using GetStoreApp.Services.Controls.Download;
-using GetStoreApp.Services.Controls.Settings.Appearance;
+using GetStoreApp.Services.Controls.Settings;
 using GetStoreApp.Services.Root;
 using GetStoreApp.Views.Windows;
 using GetStoreApp.WindowsAPI.PInvoke.Kernel32;
@@ -113,13 +113,13 @@ public void OnUnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExcep
             // 系统背景色弹出的异常，不进行处理
             if (args.Exception.HResult is -2147024809 && args.Exception.StackTrace.Contains("SystemBackdropConfiguration"))
             {
-                LogService.WriteLog(LogType.WARNING, "System backdrop config warning.", args.Exception);
+                LogService.WriteLog(LogLevel.WARNING, "System backdrop config warning.", args.Exception);
                 return;
             }
             // 处理其他异常
             else
             {
-                LogService.WriteLog(LogType.ERROR, "Unknown unhandled exception.", args.Exception);
+                LogService.WriteLog(LogLevel.ERROR, "Unknown unhandled exception.", args.Exception);
 
                 // 退出应用
                 Dispose();
@@ -232,7 +232,7 @@ private void CloseApp()
         /// </summary>
         private void SaveWindowInformation()
         {
-            ConfigService.SaveSetting(ConfigKey.IsWindowMaximizedKey, MainWindow.AppTitlebar.IsWindowMaximized);
+            ConfigService.SaveSetting(ConfigKey.IsWindowMaximizedKey, MainWindow.IsWindowMaximized);
             ConfigService.SaveSetting(ConfigKey.WindowWidthKey, MainWindow.AppWindow.Size.Width);
             ConfigService.SaveSetting(ConfigKey.WindowHeightKey, MainWindow.AppWindow.Size.Height);
             ConfigService.SaveSetting(ConfigKey.WindowPositionXAxisKey, MainWindow.AppWindow.Position.X);

diff --git a/GetStoreApp/Extensions/DataType/Constant/ConfigKey.cs b/GetStoreApp/Extensions/DataType/Constant/ConfigKey.cs
@@ -29,7 +29,7 @@ public static class ConfigKey
 
         public const string NotificationKey = "AppNotification";
 
-        public const string StartsWithEFilterKey = "StartsWithEFilterValue";
+        public const string EncryptedPackageFilterKey = "EncryptedPackageFilterValue";
 
         public const string ThemeKey = "AppTheme";
 

diff --git a/...ions/DataType/Enums/AppRuleSeletedType.cs → ...ensions/DataType/Enums/AppSortRuleKind.cs b/...ions/DataType/Enums/AppRuleSeletedType.cs → ...ensions/DataType/Enums/AppSortRuleKind.cs
@@ -3,9 +3,9 @@
     /// <summary>
     /// 应用排序规则
     /// </summary>
-    public enum AppListRuleSeletedType
+    public enum AppSortRuleKind
     {
-        PackageName = 0,
+        DisplayName = 0,
         PublisherName = 1,
         InstallDate = 2
     }

diff --git a/GetStoreApp/Extensions/DataType/Enums/ChannelKind.cs b/GetStoreApp/Extensions/DataType/Enums/ChannelKind.cs
@@ -0,0 +1,11 @@
+namespace GetStoreApp.Extensions.DataType.Enums
+{
+    public enum ChannelKind
+    {
+        WIF = 0,
+        WIS = 1,
+        RP = 2,
+        Retail = 3,
+        None = 4
+    }
+}
diff --git a/...pp/Extensions/DataType/Enums/CleanArgs.cs → ...App/Extensions/DataType/Enums/CleaKind.cs b/...pp/Extensions/DataType/Enums/CleanArgs.cs → ...App/Extensions/DataType/Enums/CleaKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 痕迹清理枚举值
     /// </summary>
-    public enum CleanArgs
+    public enum CleaKind
     {
         ActionCenter = 0,
         Download = 1,

diff --git a/GetStoreApp/Extensions/DataType/Enums/ConsoleLaunchModeArgs.cs b/GetStoreApp/Extensions/DataType/Enums/ConsoleLaunchModeArgs.cs
diff --git a/...Extensions/DataType/Enums/DataCopyType.cs → ...Extensions/DataType/Enums/DataCopyKind.cs b/...Extensions/DataType/Enums/DataCopyType.cs → ...Extensions/DataType/Enums/DataCopyKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 数据复制类型
     /// </summary>
-    public enum DataCopyType
+    public enum DataCopyKind
     {
         AppInformation = 0,
         AppUserModelId = 1,

diff --git a/...p/Extensions/DataType/Enums/DeleteArgs.cs → ...p/Extensions/DataType/Enums/DeleteKind.cs b/...p/Extensions/DataType/Enums/DeleteArgs.cs → ...p/Extensions/DataType/Enums/DeleteKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 历史记录删除方式枚举值
     /// </summary>
-    public enum DeleteArgs
+    public enum DeleteKind
     {
         History = 0,
         Download = 1,

diff --git a/.../DataType/Enums/DuplicatedDataInfoArgs.cs → ...ions/DataType/Enums/DuplicatedDataKind.cs b/.../DataType/Enums/DuplicatedDataInfoArgs.cs → ...ions/DataType/Enums/DuplicatedDataKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 重复数据参数枚举值
     /// </summary>
-    public enum DuplicatedDataInfoArgs
+    public enum DuplicatedDataKind
     {
         None = 0,
         Unfinished = 1,

diff --git a/...eApp/Extensions/DataType/Enums/LogType.cs → ...App/Extensions/DataType/Enums/LogLevel.cs b/...eApp/Extensions/DataType/Enums/LogType.cs → ...App/Extensions/DataType/Enums/LogLevel.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 日志输出级别
     /// </summary>
-    public enum LogType
+    public enum LogLevel
     {
         DEBUG = 0,
         INFO = 1,

diff --git a/.../Extensions/DataType/Enums/MessageType.cs → .../Extensions/DataType/Enums/MessageKind.cs b/.../Extensions/DataType/Enums/MessageType.cs → .../Extensions/DataType/Enums/MessageKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 需要发送的消息类型
     /// </summary>
-    public enum MessageType : uint
+    public enum MessageKind : uint
     {
         None = 0,
         Normal = 1,

diff --git a/...nsions/DataType/Enums/NotificationArgs.cs → ...nsions/DataType/Enums/NotificationKind.cs b/...nsions/DataType/Enums/NotificationArgs.cs → ...nsions/DataType/Enums/NotificationKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 应用通知参数
     /// </summary>
-    public enum NotificationArgs
+    public enum NotificationKind
     {
         DownloadAborted = 0,
         InstallApp = 1,

diff --git a/...ensions/DataType/Enums/PackageSignType.cs → ...ensions/DataType/Enums/PackageSignKind.cs b/...ensions/DataType/Enums/PackageSignType.cs → ...ensions/DataType/Enums/PackageSignKind.cs
@@ -6,7 +6,7 @@ namespace GetStoreApp.Extensions.DataType.Enums
     /// 应用包签名类型
     /// </summary>
     [Flags]
-    public enum PackageSignType
+    public enum PackageSignKind
     {
         /// <summary>
         /// 该包未签名。 例如，从布局运行的 Visual Studio 项目 (F5) 。

diff --git a/...ions/DataType/Enums/QuickOperationType.cs → ...ions/DataType/Enums/QuickOperationKind.cs b/...ions/DataType/Enums/QuickOperationType.cs → ...ions/DataType/Enums/QuickOperationKind.cs
@@ -3,9 +3,9 @@
     /// <summary>
     /// 快捷操作枚举值
     /// </summary>
-    public enum QuickOperationType
+    public enum QuickOperationKind
     {
-        DesktopShortcut = 0,
+        Desktop = 0,
         StartScreen = 1,
         Taskbar = 2,
     }

diff --git a/GetStoreApp/Extensions/DataType/Enums/TypeKind.cs b/GetStoreApp/Extensions/DataType/Enums/TypeKind.cs
@@ -0,0 +1,11 @@
+namespace GetStoreApp.Extensions.DataType.Enums
+{
+    public enum TypeKind
+    {
+        URL = 0,
+        ProductId = 1,
+        PackageFamilyName = 2,
+        CategoryId = 3,
+        None = 4
+    }
+}
diff --git a/...nsions/DataType/Enums/WinGetOptionArgs.cs → ...nsions/DataType/Enums/WinGetOptionKind.cs b/...nsions/DataType/Enums/WinGetOptionArgs.cs → ...nsions/DataType/Enums/WinGetOptionKind.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// WinGet 复制命令枚举值
     /// </summary>
-    public enum WinGetOptionArgs
+    public enum WinGetOptionKind
     {
         SearchInstall = 0,
         UnInstall = 1,

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -123,44 +123,12 @@
     <None Remove="Styles\ScrollBar.xaml" />
     <None Remove="Styles\SplitButton.xaml" />
 
-    <None Remove="UI\Controls\About\HeaderControl.xaml" />
-    <None Remove="UI\Controls\About\InstructionsControl.xaml" />
-    <None Remove="UI\Controls\About\IntroductionControl.xaml" />
-    <None Remove="UI\Controls\About\PrecautionControl.xaml" />
-    <None Remove="UI\Controls\About\ReferenceControl.xaml" />
-    <None Remove="UI\Controls\About\SettingsHelpControl.xaml" />
-    <None Remove="UI\Controls\About\ThanksControl.xaml" />
-
     <None Remove="UI\Controls\Download\CompletedControl.xaml" />
     <None Remove="UI\Controls\Download\DownloadingControl.xaml" />
     <None Remove="UI\Controls\Download\UnfinishedControl.xaml" />
 
-    <None Remove="UI\Controls\Settings\Advanced\ExperimentalFeaturesControl.xaml" />
-    <None Remove="UI\Controls\Settings\Advanced\InstallModeControl.xaml" />
-    <None Remove="UI\Controls\Settings\Advanced\LogControl.xaml" />
-    <None Remove="UI\Controls\Settings\Advanced\TraceCleanupControl.xaml" />
-
-    <None Remove="UI\Controls\Settings\Appearance\AlwaysShowBackdropControl.xaml" />
-    <None Remove="UI\Controls\Settings\Appearance\BackdropControl.xaml" />
-    <None Remove="UI\Controls\Settings\Appearance\LanguageControl.xaml" />
-    <None Remove="UI\Controls\Settings\Appearance\ThemeControl.xaml" />
-    <None Remove="UI\Controls\Settings\Appearance\TopMostControl.xaml" />
-
-    <None Remove="UI\Controls\Settings\Common\DownloadOptionsControl.xaml" />
-    <None Remove="UI\Controls\Settings\Common\HistoryRecordControl.xaml" />
-    <None Remove="UI\Controls\Settings\Common\LinkFilterControl.xaml" />
-    <None Remove="UI\Controls\Settings\Common\NotificationControl.xaml" />
-    <None Remove="UI\Controls\Settings\Common\RegionControl.xaml" />
-    <None Remove="UI\Controls\Settings\Common\WinGetConfigControl.xaml" />
-
-    <None Remove="UI\Controls\Settings\Experiment\NetWorkMonitorControl.xaml" />
-    <None Remove="UI\Controls\Settings\Experiment\OpenConfigFileControl.xaml" />
-
-    <None Remove="UI\Controls\Window\AppTitleBarControl.xaml" />
-
     <None Remove="UI\Controls\WinGet\InstalledAppsControl.xaml" />
     <None Remove="UI\Controls\WinGet\SearchAppsControl.xaml" />
-    <None Remove="UI\Controls\WinGet\InitializeFailedControl.xaml" />
     <None Remove="UI\Controls\WinGet\UpgradableAppsControl.xaml" />
 
     <None Remove="UI\Dialogs\About\AppInformationDialog.xaml" />
@@ -230,44 +198,14 @@
     <Page Update="Styles\ScrollBar.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\SplitButton.xaml" Generator="MSBuild:Compile" />
 
-    <Page Update="UI\Controls\About\HeaderControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\InstructionsControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\IntroductionControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\PrecautionControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\ReferenceControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\SettingsHelpControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\About\ThanksControl.xaml" Generator="MSBuild:Compile" />
-
     <Page Update="UI\Controls\Download\CompletedControl.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Controls\Download\DownloadingControl.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Controls\Download\UnfinishedControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Advanced\ExperimentalFeaturesControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Advanced\InstallModeControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Advanced\LogControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Advanced\TraceCleanupControl.xaml" Generator="MSBuild:Compile" />
-
-    <Page Update="UI\Controls\Settings\Appearance\AlwaysShowBackdropControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Appearance\BackdropControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Appearance\LanguageControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Appearance\ThemeControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Appearance\TopMostControl.xaml" Generator="MSBuild:Compile" />
-
-    <Page Update="UI\Controls\Settings\Common\DownloadOptionsControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Common\HistoryRecordControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Common\LinkFilterControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Common\NotificationControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Common\WinGetConfigControl.xaml" Generator="MSBuild:Compile" />
-
-    <Page Update="UI\Controls\Settings\Experiment\NetWorkMonitorControl.xaml" Generator="MSBuild:Compile" />
-    <Page Update="UI\Controls\Settings\Experiment\OpenConfigFileControl.xaml" Generator="MSBuild:Compile" />
-
-    <Page Update="UI\Controls\WinGet\InitializeFailedControl.xaml" Generator="MSBuild:Compile" />
+
     <Page Update="UI\Controls\WinGet\InstalledAppsControl.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Controls\WinGet\SearchAppsControl.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Controls\WinGet\UpgradableAppsControl.xaml" Generator="MSBuild:Compile" />
 
-    <Page Update="UI\Controls\Window\AppTitleBarControl.xaml" Generator="MSBuild:Compile" />
-
     <Page Update="UI\Dialogs\About\AppInformationDialog.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Dialogs\About\ConsoleStartupArgsDialog.xaml" Generator="MSBuild:Compile" />
     <Page Update="UI\Dialogs\About\DesktopAppsDialog.xaml" Generator="MSBuild:Compile" />

diff --git a/GetStoreApp/Helpers/Controls/Download/Aria2ProcessHelper.cs b/GetStoreApp/Helpers/Controls/Download/Aria2ProcessHelper.cs
@@ -43,7 +43,7 @@ public static unsafe bool RunAria2Process(string fileName, string arguments = ""
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.ERROR, "Aria2 Process create failed.", e);
+                LogService.WriteLog(LogLevel.ERROR, "Aria2 Process create failed.", e);
                 return false;
             }
         }
@@ -69,7 +69,7 @@ public static void KillAria2Process()
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.ERROR, "Aria2 Process kill failed.", e);
+                LogService.WriteLog(LogLevel.ERROR, "Aria2 Process kill failed.", e);
                 return;
             }
         }
@@ -103,7 +103,7 @@ public static bool IsAria2ProcessExisted()
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.ERROR, "Aria2 Process search failed.", e);
+                LogService.WriteLog(LogLevel.ERROR, "Aria2 Process search failed.", e);
                 SearchResult = false;
             }
             return SearchResult;

diff --git a/GetStoreApp/Helpers/Controls/Store/HtmlRequestHelper.cs b/GetStoreApp/Helpers/Controls/Store/HtmlRequestHelper.cs
@@ -66,7 +66,7 @@ public static async Task<RequestModel> HttpRequestAsync(string content)
                     responseSuccessBuilder.Append(response.RequestMessage is null ? "" : LogService.WhiteSpaceRegex.Replace(response.RequestMessage.ToString(), ""));
                     responseSuccessBuilder.Append('\n');
 
-                    LogService.WriteLog(LogType.INFO, "Requested successfully.", responseSuccessBuilder);
+                    LogService.WriteLog(LogLevel.INFO, "Requested successfully.", responseSuccessBuilder);
                 }
 
                 // 请求失败
@@ -86,7 +86,7 @@ public static async Task<RequestModel> HttpRequestAsync(string content)
                 RequestStatusCode = string.Empty;
                 RequestExceptionContent = e.Message;
                 RequestContent = string.Empty;
-                LogService.WriteLog(LogType.WARNING, "Network disconnected.", e);
+                LogService.WriteLog(LogLevel.WARNING, "Network disconnected.", e);
             }
 
             // 捕捉因访问超时引发的异常
@@ -96,7 +96,7 @@ public static async Task<RequestModel> HttpRequestAsync(string content)
                 RequestStatusCode = string.Empty;
                 RequestExceptionContent = e.Message;
                 RequestContent = string.Empty;
-                LogService.WriteLog(LogType.WARNING, "Network access timeout.", e);
+                LogService.WriteLog(LogLevel.WARNING, "Network access timeout.", e);
             }
 
             // 其他异常
@@ -106,7 +106,7 @@ public static async Task<RequestModel> HttpRequestAsync(string content)
                 RequestStatusCode = string.Empty;
                 RequestExceptionContent = e.Message;
                 RequestContent = string.Empty;
-                LogService.WriteLog(LogType.WARNING, "Network state unknown.", e);
+                LogService.WriteLog(LogLevel.WARNING, "Network state unknown.", e);
             }
             finally
             {

diff --git a/GetStoreApp/Helpers/Converters/StringConverterHelper.cs b/GetStoreApp/Helpers/Converters/StringConverterHelper.cs
@@ -1,5 +1,5 @@
 using GetStoreApp.Helpers.Root;
-using GetStoreApp.Services.Controls.Settings.Common;
+using GetStoreApp.Services.Controls.Settings;
 using GetStoreApp.Services.Root;
 using System;
 using System.Collections.Generic;

diff --git a/GetStoreApp/Helpers/Root/IOHelper.cs b/GetStoreApp/Helpers/Root/IOHelper.cs
@@ -42,7 +42,7 @@ public static bool CleanFolder(StorageFolder folder)
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.ERROR, "Folder delete failed.", e);
+                LogService.WriteLog(LogLevel.ERROR, "Folder delete failed.", e);
                 return false;
             }
         }
@@ -85,7 +85,7 @@ public static async Task<string> GetFileSHA1Async(string filePath)
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.WARNING, "File SHA1 verify failed.", e);
+                LogService.WriteLog(LogLevel.WARNING, "File SHA1 verify failed.", e);
                 return string.Empty;
             }
         }

diff --git a/GetStoreApp/Helpers/Root/ProcessHelper.cs b/GetStoreApp/Helpers/Root/ProcessHelper.cs
@@ -47,7 +47,7 @@ public static unsafe List<uint> GetProcessPIDByName(string processName)
             }
             catch (Exception e)
             {
-                LogService.WriteLog(LogType.ERROR, "Get process Pid list failed.", e);
+                LogService.WriteLog(LogLevel.ERROR, "Get process Pid list failed.", e);
                 return ProcessEntry32PIDList;
             }
         }

diff --git a/GetStoreApp/Models/Dialogs/Settings/TraceCleanupModel.cs b/GetStoreApp/Models/Dialogs/Settings/TraceCleanupModel.cs
@@ -49,7 +49,7 @@ public bool IsCleanFailed
         /// <summary>
         /// 清理选项内部的名称
         /// </summary>
-        public CleanArgs InternalName { get; set; }
+        public CleaKind InternalName { get; set; }
 
         /// <summary>
         /// 清理失败时详细的错误文字信息

diff --git a/GetStoreApp/Program.cs b/GetStoreApp/Program.cs
@@ -1,10 +1,7 @@
 using GetStoreApp.Helpers.Root;
 using GetStoreApp.Properties;
 using GetStoreApp.Services.Controls.Download;
-using GetStoreApp.Services.Controls.Settings.Advanced;
-using GetStoreApp.Services.Controls.Settings.Appearance;
-using GetStoreApp.Services.Controls.Settings.Common;
-using GetStoreApp.Services.Controls.Settings.Experiment;
+using GetStoreApp.Services.Controls.Settings;
 using GetStoreApp.Services.Root;
 using GetStoreApp.WindowsAPI.PInvoke.Kernel32;
 using Microsoft.UI.Dispatching;