From 5135afcf8f9fada0acaafb1e56f3716ba7ff86f2 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:32:26 +0800 Subject: [PATCH] Refactor --- v2rayN/v2rayN/{Base => Common}/DownloaderHelper.cs | 2 +- v2rayN/v2rayN/{Tool => Common}/FileManager.cs | 0 v2rayN/v2rayN/{Base => Common}/HttpClientHelper.cs | 2 +- v2rayN/v2rayN/{Tool => Common}/Job.cs | 0 v2rayN/v2rayN/{Tool => Common}/JsonUtils.cs | 0 v2rayN/v2rayN/{Tool => Common}/Logging.cs | 0 v2rayN/v2rayN/{Tool => Common}/QueryableExtension.cs | 0 v2rayN/v2rayN/{Tool => Common}/SemanticVersion.cs | 4 +--- v2rayN/v2rayN/{Base => Common}/SqliteHelper.cs | 2 +- v2rayN/v2rayN/{Base => Common}/StringEx.cs | 2 +- v2rayN/v2rayN/{Tool => Common}/UI.cs | 0 v2rayN/v2rayN/{Tool => Common}/Utils.cs | 2 +- v2rayN/v2rayN/Handler/ConfigHandler.cs | 1 - v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 1 - v2rayN/v2rayN/Handler/CoreConfigV2ray.cs | 1 - v2rayN/v2rayN/Handler/DownloadHandle.cs | 1 - v2rayN/v2rayN/Handler/LazyConfig.cs | 1 - v2rayN/v2rayN/Handler/ProfileExHandler.cs | 1 - v2rayN/v2rayN/Handler/ShareHandler.cs | 1 - v2rayN/v2rayN/Handler/StatisticsHandler.cs | 1 - v2rayN/v2rayN/Handler/UpdateHandle.cs | 1 - v2rayN/v2rayN/Mode/ProfileItem.cs | 1 - v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/AddServerViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/SubEditViewModel.cs | 1 - v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs | 1 - v2rayN/v2rayN/Views/AddServerWindow.xaml.cs | 1 - v2rayN/v2rayN/Views/MsgView.xaml.cs | 1 - v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs | 1 - 33 files changed, 6 insertions(+), 29 deletions(-) rename v2rayN/v2rayN/{Base => Common}/DownloaderHelper.cs (99%) rename v2rayN/v2rayN/{Tool => Common}/FileManager.cs (100%) rename v2rayN/v2rayN/{Base => Common}/HttpClientHelper.cs (99%) rename v2rayN/v2rayN/{Tool => Common}/Job.cs (100%) rename v2rayN/v2rayN/{Tool => Common}/JsonUtils.cs (100%) rename v2rayN/v2rayN/{Tool => Common}/Logging.cs (100%) rename v2rayN/v2rayN/{Tool => Common}/QueryableExtension.cs (100%) rename v2rayN/v2rayN/{Tool => Common}/SemanticVersion.cs (99%) rename v2rayN/v2rayN/{Base => Common}/SqliteHelper.cs (99%) rename v2rayN/v2rayN/{Base => Common}/StringEx.cs (98%) rename v2rayN/v2rayN/{Tool => Common}/UI.cs (100%) rename v2rayN/v2rayN/{Tool => Common}/Utils.cs (99%) diff --git a/v2rayN/v2rayN/Base/DownloaderHelper.cs b/v2rayN/v2rayN/Common/DownloaderHelper.cs similarity index 99% rename from v2rayN/v2rayN/Base/DownloaderHelper.cs rename to v2rayN/v2rayN/Common/DownloaderHelper.cs index 51a7840b..21e16535 100644 --- a/v2rayN/v2rayN/Base/DownloaderHelper.cs +++ b/v2rayN/v2rayN/Common/DownloaderHelper.cs @@ -2,7 +2,7 @@ using System.IO; using System.Net; -namespace v2rayN.Base +namespace v2rayN { internal class DownloaderHelper { diff --git a/v2rayN/v2rayN/Tool/FileManager.cs b/v2rayN/v2rayN/Common/FileManager.cs similarity index 100% rename from v2rayN/v2rayN/Tool/FileManager.cs rename to v2rayN/v2rayN/Common/FileManager.cs diff --git a/v2rayN/v2rayN/Base/HttpClientHelper.cs b/v2rayN/v2rayN/Common/HttpClientHelper.cs similarity index 99% rename from v2rayN/v2rayN/Base/HttpClientHelper.cs rename to v2rayN/v2rayN/Common/HttpClientHelper.cs index 8137c873..0c6e6ebb 100644 --- a/v2rayN/v2rayN/Base/HttpClientHelper.cs +++ b/v2rayN/v2rayN/Common/HttpClientHelper.cs @@ -3,7 +3,7 @@ using System.Net.Http; using System.Net.Mime; using System.Text; -namespace v2rayN.Base +namespace v2rayN { /// /// diff --git a/v2rayN/v2rayN/Tool/Job.cs b/v2rayN/v2rayN/Common/Job.cs similarity index 100% rename from v2rayN/v2rayN/Tool/Job.cs rename to v2rayN/v2rayN/Common/Job.cs diff --git a/v2rayN/v2rayN/Tool/JsonUtils.cs b/v2rayN/v2rayN/Common/JsonUtils.cs similarity index 100% rename from v2rayN/v2rayN/Tool/JsonUtils.cs rename to v2rayN/v2rayN/Common/JsonUtils.cs diff --git a/v2rayN/v2rayN/Tool/Logging.cs b/v2rayN/v2rayN/Common/Logging.cs similarity index 100% rename from v2rayN/v2rayN/Tool/Logging.cs rename to v2rayN/v2rayN/Common/Logging.cs diff --git a/v2rayN/v2rayN/Tool/QueryableExtension.cs b/v2rayN/v2rayN/Common/QueryableExtension.cs similarity index 100% rename from v2rayN/v2rayN/Tool/QueryableExtension.cs rename to v2rayN/v2rayN/Common/QueryableExtension.cs diff --git a/v2rayN/v2rayN/Tool/SemanticVersion.cs b/v2rayN/v2rayN/Common/SemanticVersion.cs similarity index 99% rename from v2rayN/v2rayN/Tool/SemanticVersion.cs rename to v2rayN/v2rayN/Common/SemanticVersion.cs index c23b7a67..597ed970 100644 --- a/v2rayN/v2rayN/Tool/SemanticVersion.cs +++ b/v2rayN/v2rayN/Common/SemanticVersion.cs @@ -1,6 +1,4 @@ -using v2rayN.Base; - -namespace v2rayN +namespace v2rayN { public class SemanticVersion { diff --git a/v2rayN/v2rayN/Base/SqliteHelper.cs b/v2rayN/v2rayN/Common/SqliteHelper.cs similarity index 99% rename from v2rayN/v2rayN/Base/SqliteHelper.cs rename to v2rayN/v2rayN/Common/SqliteHelper.cs index 7903f3f1..42ca84f5 100644 --- a/v2rayN/v2rayN/Base/SqliteHelper.cs +++ b/v2rayN/v2rayN/Common/SqliteHelper.cs @@ -1,7 +1,7 @@ using SQLite; using System.Collections; -namespace v2rayN.Base +namespace v2rayN { public sealed class SqliteHelper { diff --git a/v2rayN/v2rayN/Base/StringEx.cs b/v2rayN/v2rayN/Common/StringEx.cs similarity index 98% rename from v2rayN/v2rayN/Base/StringEx.cs rename to v2rayN/v2rayN/Common/StringEx.cs index cf0f9106..57ba7795 100644 --- a/v2rayN/v2rayN/Base/StringEx.cs +++ b/v2rayN/v2rayN/Common/StringEx.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; -namespace v2rayN.Base +namespace v2rayN { internal static class StringEx { diff --git a/v2rayN/v2rayN/Tool/UI.cs b/v2rayN/v2rayN/Common/UI.cs similarity index 100% rename from v2rayN/v2rayN/Tool/UI.cs rename to v2rayN/v2rayN/Common/UI.cs diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs similarity index 99% rename from v2rayN/v2rayN/Tool/Utils.cs rename to v2rayN/v2rayN/Common/Utils.cs index 1377cb3d..fd8f9499 100644 --- a/v2rayN/v2rayN/Tool/Utils.cs +++ b/v2rayN/v2rayN/Common/Utils.cs @@ -524,7 +524,7 @@ namespace v2rayN Logging.SaveLog(ex.Message, ex); } } - + /// /// 获取启动了应用程序的可执行文件的路径 diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 3880242b..d034f4de 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -1,7 +1,6 @@ using System.Data; using System.IO; using System.Text.RegularExpressions; -using v2rayN.Base; using v2rayN.Mode; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs index 7e1f24ce..78ac1ece 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs @@ -1,6 +1,5 @@ using System.Net; using System.Net.NetworkInformation; -using v2rayN.Base; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs index 8206bd54..c2bb713b 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs @@ -2,7 +2,6 @@ using System.IO; using System.Net; using System.Net.NetworkInformation; -using v2rayN.Base; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index fc3aceb7..0b761cda 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Sockets; -using v2rayN.Base; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 73040e24..0e16af1e 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -1,5 +1,4 @@ using System.Runtime.Intrinsics.X86; -using v2rayN.Base; using v2rayN.Mode; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/ProfileExHandler.cs b/v2rayN/v2rayN/Handler/ProfileExHandler.cs index 26d164fc..13447e9e 100644 --- a/v2rayN/v2rayN/Handler/ProfileExHandler.cs +++ b/v2rayN/v2rayN/Handler/ProfileExHandler.cs @@ -1,6 +1,5 @@ using System.Collections.Concurrent; using System.Reactive.Linq; -using v2rayN.Base; using v2rayN.Mode; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs index 79be638b..dec56779 100644 --- a/v2rayN/v2rayN/Handler/ShareHandler.cs +++ b/v2rayN/v2rayN/Handler/ShareHandler.cs @@ -1,7 +1,6 @@ using System.Collections.Specialized; using System.Text.RegularExpressions; using System.Web; -using v2rayN.Base; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs index 032069e7..dd4d9d66 100644 --- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs +++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs @@ -1,6 +1,5 @@ using System.Net; using System.Net.Sockets; -using v2rayN.Base; using v2rayN.Mode; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs index d325f1ce..fa24247f 100644 --- a/v2rayN/v2rayN/Handler/UpdateHandle.cs +++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs @@ -6,7 +6,6 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using System.Windows; -using v2rayN.Base; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Mode/ProfileItem.cs b/v2rayN/v2rayN/Mode/ProfileItem.cs index 3e1a4e8e..999901db 100644 --- a/v2rayN/v2rayN/Mode/ProfileItem.cs +++ b/v2rayN/v2rayN/Mode/ProfileItem.cs @@ -1,5 +1,4 @@ using SQLite; -using v2rayN.Base; namespace v2rayN.Mode { diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs index 83380bf0..34b3a93f 100644 --- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs @@ -6,7 +6,6 @@ using Splat; using System.IO; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs index 6c579567..19b7cd2d 100644 --- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs @@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 898ba6d1..64a219b8 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -15,7 +15,6 @@ using System.Reactive.Linq; using System.Text; using System.Windows; using System.Windows.Media; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs index aa6663da..c6c9e5f1 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs @@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs index b50005f1..d1bf0cfe 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs @@ -5,7 +5,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs index 9de95aed..0a19f4c4 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs @@ -4,7 +4,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs index bab90942..c6ad0a17 100644 --- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs @@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs index cb9e6aea..b5631c38 100644 --- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs @@ -6,7 +6,6 @@ using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; using System.Windows; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index aa43f0ab..8ad2605f 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -2,7 +2,6 @@ using System.Reactive.Disposables; using System.Windows; using System.Windows.Controls; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayN/v2rayN/Views/MsgView.xaml.cs index 59276400..e60bb9db 100644 --- a/v2rayN/v2rayN/Views/MsgView.xaml.cs +++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs @@ -2,7 +2,6 @@ using ReactiveUI; using System.Reactive.Linq; using System.Text.RegularExpressions; using System.Windows.Threading; -using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs index ac1fb8ec..395b5af4 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs @@ -1,7 +1,6 @@ using ReactiveUI; using System.Reactive.Disposables; using System.Windows; -using v2rayN.Base; using v2rayN.Mode; using v2rayN.ViewModels;