diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs index 6b44f961..a8571737 100644 --- a/v2rayN/v2rayN/App.xaml.cs +++ b/v2rayN/v2rayN/App.xaml.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Threading; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN { diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index e82a014a..9df96dc0 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -1,4 +1,4 @@ -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN { diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index fa2377c6..aea543f1 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -1,7 +1,7 @@ using System.Data; using System.IO; using System.Text.RegularExpressions; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs index bfe35382..bc7c9298 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs @@ -1,5 +1,5 @@ using System.IO; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs index dda659de..dc175de3 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs @@ -1,6 +1,6 @@ using System.Net; using System.Net.NetworkInformation; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs index f258bb26..202f1363 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs @@ -1,6 +1,6 @@ using System.Net; using System.Net.NetworkInformation; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs index 5ee8bf54..6c7e64bd 100644 --- a/v2rayN/v2rayN/Handler/CoreHandler.cs +++ b/v2rayN/v2rayN/Handler/CoreHandler.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reactive.Linq; using System.Text; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index 8147eb94..d29106e6 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Sockets; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/HotkeyHandler.cs b/v2rayN/v2rayN/Handler/HotkeyHandler.cs index c2e21097..6ffec9ae 100644 --- a/v2rayN/v2rayN/Handler/HotkeyHandler.cs +++ b/v2rayN/v2rayN/Handler/HotkeyHandler.cs @@ -4,7 +4,7 @@ using System.Text; using System.Windows; using System.Windows.Input; using System.Windows.Interop; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 80055877..04766ffe 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -1,5 +1,5 @@ using System.Runtime.Intrinsics.X86; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs index 4774992c..5d5d61dd 100644 --- a/v2rayN/v2rayN/Handler/MainFormHandler.cs +++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs @@ -3,7 +3,7 @@ using Splat; using System.Drawing; using System.IO; using System.Windows.Media.Imaging; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/ProfileExHandler.cs b/v2rayN/v2rayN/Handler/ProfileExHandler.cs index 977b32ff..13d0ae0e 100644 --- a/v2rayN/v2rayN/Handler/ProfileExHandler.cs +++ b/v2rayN/v2rayN/Handler/ProfileExHandler.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; using System.Reactive.Linq; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs index e268b3ce..90490578 100644 --- a/v2rayN/v2rayN/Handler/ShareHandler.cs +++ b/v2rayN/v2rayN/Handler/ShareHandler.cs @@ -1,6 +1,6 @@ using System.Collections.Specialized; using System.Text.RegularExpressions; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index db5ac6b4..e30118a8 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Net; using System.Net.Sockets; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs index 161e47ac..f99a461b 100644 --- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs +++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs @@ -1,4 +1,4 @@ -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs index d838c1b8..14caa368 100644 --- a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs +++ b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs @@ -1,6 +1,6 @@ using System.Net.WebSockets; using System.Text; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs index 8fbc2e9f..dfb74356 100644 --- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs +++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs @@ -1,19 +1,19 @@ using Grpc.Core; using Grpc.Net.Client; using ProtosLib.Statistics; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { internal class StatisticsV2ray { - private Model.Config _config; + private Models.Config _config; private GrpcChannel? _channel; private StatsService.StatsServiceClient? _client; private bool _exitFlag; private Action _updateFunc; - public StatisticsV2ray(Model.Config config, Action update) + public StatisticsV2ray(Models.Config config, Action update) { _config = config; _updateFunc = update; diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs index 8e0bd475..d6131398 100644 --- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs +++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs @@ -1,5 +1,5 @@ using PacLib; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Handler { diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs index 51dd98df..175b3af2 100644 --- a/v2rayN/v2rayN/Handler/UpdateHandle.cs +++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using System.Windows; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Handler diff --git a/v2rayN/v2rayN/Model/ComboItem.cs b/v2rayN/v2rayN/Models/ComboItem.cs similarity index 86% rename from v2rayN/v2rayN/Model/ComboItem.cs rename to v2rayN/v2rayN/Models/ComboItem.cs index 73ed4e79..836d88bd 100644 --- a/v2rayN/v2rayN/Model/ComboItem.cs +++ b/v2rayN/v2rayN/Models/ComboItem.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public class ComboItem { diff --git a/v2rayN/v2rayN/Model/Config.cs b/v2rayN/v2rayN/Models/Config.cs similarity index 97% rename from v2rayN/v2rayN/Model/Config.cs rename to v2rayN/v2rayN/Models/Config.cs index 9d1c6b79..d763f485 100644 --- a/v2rayN/v2rayN/Model/Config.cs +++ b/v2rayN/v2rayN/Models/Config.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { /// /// 本软件配置文件实体类 diff --git a/v2rayN/v2rayN/Model/ConfigItems.cs b/v2rayN/v2rayN/Models/ConfigItems.cs similarity index 99% rename from v2rayN/v2rayN/Model/ConfigItems.cs rename to v2rayN/v2rayN/Models/ConfigItems.cs index 1a0d402d..729d024f 100644 --- a/v2rayN/v2rayN/Model/ConfigItems.cs +++ b/v2rayN/v2rayN/Models/ConfigItems.cs @@ -1,6 +1,6 @@ using System.Windows.Input; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class CoreBasicItem diff --git a/v2rayN/v2rayN/Model/ConfigOld.cs b/v2rayN/v2rayN/Models/ConfigOld.cs similarity index 99% rename from v2rayN/v2rayN/Model/ConfigOld.cs rename to v2rayN/v2rayN/Models/ConfigOld.cs index ebe97786..9f27b610 100644 --- a/v2rayN/v2rayN/Model/ConfigOld.cs +++ b/v2rayN/v2rayN/Models/ConfigOld.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class ConfigOld diff --git a/v2rayN/v2rayN/Model/CoreInfo.cs b/v2rayN/v2rayN/Models/CoreInfo.cs similarity index 95% rename from v2rayN/v2rayN/Model/CoreInfo.cs rename to v2rayN/v2rayN/Models/CoreInfo.cs index 0c4460cd..00ecb3fd 100644 --- a/v2rayN/v2rayN/Model/CoreInfo.cs +++ b/v2rayN/v2rayN/Models/CoreInfo.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class CoreInfo diff --git a/v2rayN/v2rayN/Model/DNSItem.cs b/v2rayN/v2rayN/Models/DNSItem.cs similarity index 95% rename from v2rayN/v2rayN/Model/DNSItem.cs rename to v2rayN/v2rayN/Models/DNSItem.cs index 013f2c52..315de91d 100644 --- a/v2rayN/v2rayN/Model/DNSItem.cs +++ b/v2rayN/v2rayN/Models/DNSItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class DNSItem diff --git a/v2rayN/v2rayN/Model/EConfigType.cs b/v2rayN/v2rayN/Models/EConfigType.cs similarity index 89% rename from v2rayN/v2rayN/Model/EConfigType.cs rename to v2rayN/v2rayN/Models/EConfigType.cs index b0fb7409..60f43d74 100644 --- a/v2rayN/v2rayN/Model/EConfigType.cs +++ b/v2rayN/v2rayN/Models/EConfigType.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EConfigType { diff --git a/v2rayN/v2rayN/Model/ECoreType.cs b/v2rayN/v2rayN/Models/ECoreType.cs similarity index 92% rename from v2rayN/v2rayN/Model/ECoreType.cs rename to v2rayN/v2rayN/Models/ECoreType.cs index 0557cc1e..f1556b32 100644 --- a/v2rayN/v2rayN/Model/ECoreType.cs +++ b/v2rayN/v2rayN/Models/ECoreType.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum ECoreType { diff --git a/v2rayN/v2rayN/Model/EGlobalHotkey.cs b/v2rayN/v2rayN/Models/EGlobalHotkey.cs similarity index 86% rename from v2rayN/v2rayN/Model/EGlobalHotkey.cs rename to v2rayN/v2rayN/Models/EGlobalHotkey.cs index 60436a40..46183028 100644 --- a/v2rayN/v2rayN/Model/EGlobalHotkey.cs +++ b/v2rayN/v2rayN/Models/EGlobalHotkey.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EGlobalHotkey { diff --git a/v2rayN/v2rayN/Model/EInboundProtocol.cs b/v2rayN/v2rayN/Models/EInboundProtocol.cs similarity index 85% rename from v2rayN/v2rayN/Model/EInboundProtocol.cs rename to v2rayN/v2rayN/Models/EInboundProtocol.cs index 4d94b582..79440fb9 100644 --- a/v2rayN/v2rayN/Model/EInboundProtocol.cs +++ b/v2rayN/v2rayN/Models/EInboundProtocol.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EInboundProtocol { diff --git a/v2rayN/v2rayN/Model/EMove.cs b/v2rayN/v2rayN/Models/EMove.cs similarity index 82% rename from v2rayN/v2rayN/Model/EMove.cs rename to v2rayN/v2rayN/Models/EMove.cs index 4be8a004..0629e62d 100644 --- a/v2rayN/v2rayN/Model/EMove.cs +++ b/v2rayN/v2rayN/Models/EMove.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EMove { diff --git a/v2rayN/v2rayN/Model/EServerColName.cs b/v2rayN/v2rayN/Models/EServerColName.cs similarity index 91% rename from v2rayN/v2rayN/Model/EServerColName.cs rename to v2rayN/v2rayN/Models/EServerColName.cs index c20c9379..8bf9111b 100644 --- a/v2rayN/v2rayN/Model/EServerColName.cs +++ b/v2rayN/v2rayN/Models/EServerColName.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EServerColName { diff --git a/v2rayN/v2rayN/Model/ESpeedActionType.cs b/v2rayN/v2rayN/Models/ESpeedActionType.cs similarity index 80% rename from v2rayN/v2rayN/Model/ESpeedActionType.cs rename to v2rayN/v2rayN/Models/ESpeedActionType.cs index 631ec980..dee29709 100644 --- a/v2rayN/v2rayN/Model/ESpeedActionType.cs +++ b/v2rayN/v2rayN/Models/ESpeedActionType.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum ESpeedActionType { diff --git a/v2rayN/v2rayN/Model/ESysProxyType.cs b/v2rayN/v2rayN/Models/ESysProxyType.cs similarity index 82% rename from v2rayN/v2rayN/Model/ESysProxyType.cs rename to v2rayN/v2rayN/Models/ESysProxyType.cs index 1038e764..9c5bb423 100644 --- a/v2rayN/v2rayN/Model/ESysProxyType.cs +++ b/v2rayN/v2rayN/Models/ESysProxyType.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum ESysProxyType { diff --git a/v2rayN/v2rayN/Model/ETransport.cs b/v2rayN/v2rayN/Models/ETransport.cs similarity index 84% rename from v2rayN/v2rayN/Model/ETransport.cs rename to v2rayN/v2rayN/Models/ETransport.cs index 922f35ae..15eac5da 100644 --- a/v2rayN/v2rayN/Model/ETransport.cs +++ b/v2rayN/v2rayN/Models/ETransport.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum ETransport { diff --git a/v2rayN/v2rayN/Model/EViewAction.cs b/v2rayN/v2rayN/Models/EViewAction.cs similarity index 77% rename from v2rayN/v2rayN/Model/EViewAction.cs rename to v2rayN/v2rayN/Models/EViewAction.cs index 9d2b751f..1abdbde8 100644 --- a/v2rayN/v2rayN/Model/EViewAction.cs +++ b/v2rayN/v2rayN/Models/EViewAction.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public enum EViewAction { diff --git a/v2rayN/v2rayN/Model/GitHubRelease.cs b/v2rayN/v2rayN/Models/GitHubRelease.cs similarity index 98% rename from v2rayN/v2rayN/Model/GitHubRelease.cs rename to v2rayN/v2rayN/Models/GitHubRelease.cs index c83ac6a6..84520d14 100644 --- a/v2rayN/v2rayN/Model/GitHubRelease.cs +++ b/v2rayN/v2rayN/Models/GitHubRelease.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace v2rayN.Model +namespace v2rayN.Models { public class GitHubReleaseAsset { diff --git a/v2rayN/v2rayN/Model/ProfileExItem.cs b/v2rayN/v2rayN/Models/ProfileExItem.cs similarity index 91% rename from v2rayN/v2rayN/Model/ProfileExItem.cs rename to v2rayN/v2rayN/Models/ProfileExItem.cs index 6fc17de9..b572bd50 100644 --- a/v2rayN/v2rayN/Model/ProfileExItem.cs +++ b/v2rayN/v2rayN/Models/ProfileExItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class ProfileExItem diff --git a/v2rayN/v2rayN/Model/ProfileItem.cs b/v2rayN/v2rayN/Models/ProfileItem.cs similarity index 99% rename from v2rayN/v2rayN/Model/ProfileItem.cs rename to v2rayN/v2rayN/Models/ProfileItem.cs index 4e277821..9118abff 100644 --- a/v2rayN/v2rayN/Model/ProfileItem.cs +++ b/v2rayN/v2rayN/Models/ProfileItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class ProfileItem diff --git a/v2rayN/v2rayN/Model/ProfileItemModel.cs b/v2rayN/v2rayN/Models/ProfileItemModel.cs similarity index 95% rename from v2rayN/v2rayN/Model/ProfileItemModel.cs rename to v2rayN/v2rayN/Models/ProfileItemModel.cs index 3ddd3d01..8208d576 100644 --- a/v2rayN/v2rayN/Model/ProfileItemModel.cs +++ b/v2rayN/v2rayN/Models/ProfileItemModel.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class ProfileItemModel : ProfileItem diff --git a/v2rayN/v2rayN/Model/RoutingItem.cs b/v2rayN/v2rayN/Models/RoutingItem.cs similarity index 95% rename from v2rayN/v2rayN/Model/RoutingItem.cs rename to v2rayN/v2rayN/Models/RoutingItem.cs index 8e9e215d..ac0d36d5 100644 --- a/v2rayN/v2rayN/Model/RoutingItem.cs +++ b/v2rayN/v2rayN/Models/RoutingItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class RoutingItem diff --git a/v2rayN/v2rayN/Model/RoutingItemModel.cs b/v2rayN/v2rayN/Models/RoutingItemModel.cs similarity index 81% rename from v2rayN/v2rayN/Model/RoutingItemModel.cs rename to v2rayN/v2rayN/Models/RoutingItemModel.cs index 2c26e2ae..3e2fd4fc 100644 --- a/v2rayN/v2rayN/Model/RoutingItemModel.cs +++ b/v2rayN/v2rayN/Models/RoutingItemModel.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class RoutingItemModel : RoutingItem diff --git a/v2rayN/v2rayN/Model/RulesItem.cs b/v2rayN/v2rayN/Models/RulesItem.cs similarity index 95% rename from v2rayN/v2rayN/Model/RulesItem.cs rename to v2rayN/v2rayN/Models/RulesItem.cs index a1780e22..cf6c367e 100644 --- a/v2rayN/v2rayN/Model/RulesItem.cs +++ b/v2rayN/v2rayN/Models/RulesItem.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class RulesItem diff --git a/v2rayN/v2rayN/Model/RulesItemModel.cs b/v2rayN/v2rayN/Models/RulesItemModel.cs similarity index 90% rename from v2rayN/v2rayN/Model/RulesItemModel.cs rename to v2rayN/v2rayN/Models/RulesItemModel.cs index 541f7d2c..fbe7c57a 100644 --- a/v2rayN/v2rayN/Model/RulesItemModel.cs +++ b/v2rayN/v2rayN/Models/RulesItemModel.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class RulesItemModel : RulesItem diff --git a/v2rayN/v2rayN/Model/ServerSpeedItem.cs b/v2rayN/v2rayN/Models/ServerSpeedItem.cs similarity index 95% rename from v2rayN/v2rayN/Model/ServerSpeedItem.cs rename to v2rayN/v2rayN/Models/ServerSpeedItem.cs index d6ceb6b8..274fa493 100644 --- a/v2rayN/v2rayN/Model/ServerSpeedItem.cs +++ b/v2rayN/v2rayN/Models/ServerSpeedItem.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] internal class ServerSpeedItem : ServerStatItem diff --git a/v2rayN/v2rayN/Model/ServerStatItem.cs b/v2rayN/v2rayN/Models/ServerStatItem.cs similarity index 95% rename from v2rayN/v2rayN/Model/ServerStatItem.cs rename to v2rayN/v2rayN/Models/ServerStatItem.cs index f6352b07..a24b78b0 100644 --- a/v2rayN/v2rayN/Model/ServerStatItem.cs +++ b/v2rayN/v2rayN/Models/ServerStatItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class ServerStatItem diff --git a/v2rayN/v2rayN/Model/ServerTestItem.cs b/v2rayN/v2rayN/Models/ServerTestItem.cs similarity index 92% rename from v2rayN/v2rayN/Model/ServerTestItem.cs rename to v2rayN/v2rayN/Models/ServerTestItem.cs index 99f806de..3955da77 100644 --- a/v2rayN/v2rayN/Model/ServerTestItem.cs +++ b/v2rayN/v2rayN/Models/ServerTestItem.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] internal class ServerTestItem diff --git a/v2rayN/v2rayN/Model/SingboxConfig.cs b/v2rayN/v2rayN/Models/SingboxConfig.cs similarity index 99% rename from v2rayN/v2rayN/Model/SingboxConfig.cs rename to v2rayN/v2rayN/Models/SingboxConfig.cs index ff01457b..476dcaef 100644 --- a/v2rayN/v2rayN/Model/SingboxConfig.cs +++ b/v2rayN/v2rayN/Models/SingboxConfig.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public class SingboxConfig { diff --git a/v2rayN/v2rayN/Model/SsSIP008.cs b/v2rayN/v2rayN/Models/SsSIP008.cs similarity index 93% rename from v2rayN/v2rayN/Model/SsSIP008.cs rename to v2rayN/v2rayN/Models/SsSIP008.cs index 3f443ed2..3600a438 100644 --- a/v2rayN/v2rayN/Model/SsSIP008.cs +++ b/v2rayN/v2rayN/Models/SsSIP008.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { public class SsSIP008 { diff --git a/v2rayN/v2rayN/Model/SubItem.cs b/v2rayN/v2rayN/Models/SubItem.cs similarity index 96% rename from v2rayN/v2rayN/Model/SubItem.cs rename to v2rayN/v2rayN/Models/SubItem.cs index 6df0cb06..1f36bb9a 100644 --- a/v2rayN/v2rayN/Model/SubItem.cs +++ b/v2rayN/v2rayN/Models/SubItem.cs @@ -1,6 +1,6 @@ using SQLite; -namespace v2rayN.Model +namespace v2rayN.Models { [Serializable] public class SubItem diff --git a/v2rayN/v2rayN/Model/SysProxyConfig.cs b/v2rayN/v2rayN/Models/SysProxyConfig.cs similarity index 93% rename from v2rayN/v2rayN/Model/SysProxyConfig.cs rename to v2rayN/v2rayN/Models/SysProxyConfig.cs index eac6a6ae..95c2221b 100644 --- a/v2rayN/v2rayN/Model/SysProxyConfig.cs +++ b/v2rayN/v2rayN/Models/SysProxyConfig.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { internal class SysProxyConfig { diff --git a/v2rayN/v2rayN/Model/V2rayConfig.cs b/v2rayN/v2rayN/Models/V2rayConfig.cs similarity index 99% rename from v2rayN/v2rayN/Model/V2rayConfig.cs rename to v2rayN/v2rayN/Models/V2rayConfig.cs index b99e2d71..41b86f53 100644 --- a/v2rayN/v2rayN/Model/V2rayConfig.cs +++ b/v2rayN/v2rayN/Models/V2rayConfig.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace v2rayN.Model +namespace v2rayN.Models { /// /// v2ray配置文件实体类 例子SampleConfig.txt diff --git a/v2rayN/v2rayN/Model/V2rayTcpRequest.cs b/v2rayN/v2rayN/Models/V2rayTcpRequest.cs similarity index 93% rename from v2rayN/v2rayN/Model/V2rayTcpRequest.cs rename to v2rayN/v2rayN/Models/V2rayTcpRequest.cs index 9290e868..89158f19 100644 --- a/v2rayN/v2rayN/Model/V2rayTcpRequest.cs +++ b/v2rayN/v2rayN/Models/V2rayTcpRequest.cs @@ -1,4 +1,4 @@ -namespace v2rayN.Model +namespace v2rayN.Models { /// /// Tcp伪装http的Request,只要Host diff --git a/v2rayN/v2rayN/Model/VmessQRCode.cs b/v2rayN/v2rayN/Models/VmessQRCode.cs similarity index 98% rename from v2rayN/v2rayN/Model/VmessQRCode.cs rename to v2rayN/v2rayN/Models/VmessQRCode.cs index 91cf3cec..e37d5c62 100644 --- a/v2rayN/v2rayN/Model/VmessQRCode.cs +++ b/v2rayN/v2rayN/Models/VmessQRCode.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace v2rayN.Model +namespace v2rayN.Models { /// /// https://github.com/2dust/v2rayN/wiki/ diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs index d6b1ec33..1717aa1e 100644 --- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs @@ -6,7 +6,7 @@ using System.IO; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs index c3fe52ba..64c87c90 100644 --- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs @@ -4,7 +4,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs index e23922b7..685f8ed7 100644 --- a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs @@ -4,7 +4,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index eaee1d1c..df485a71 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -15,7 +15,7 @@ using System.Text; using System.Windows; using System.Windows.Media; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.Views; diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs index 0138561d..79e046bd 100644 --- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs @@ -4,7 +4,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs index 53177975..2b49b211 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs @@ -4,7 +4,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs index dec1932b..23366026 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs @@ -5,7 +5,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.Views; using Application = System.Windows.Application; diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs index f7f10861..5c1936a0 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs @@ -5,7 +5,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.Views; diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs index 94832457..54bb01be 100644 --- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs @@ -4,7 +4,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.ViewModels diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs index 7c25de41..6a4f987b 100644 --- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs @@ -7,7 +7,7 @@ using Splat; using System.Reactive; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.Views; diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs index 53088188..414cef74 100644 --- a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs @@ -1,7 +1,7 @@ using ReactiveUI; using System.Reactive.Disposables; using System.Windows; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index ca82abfb..8668e6e5 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -3,7 +3,7 @@ using System.Reactive.Disposables; using System.Windows; using System.Windows.Controls; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.ViewModels; diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs index a9af6b59..7226aa93 100644 --- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs @@ -2,7 +2,7 @@ using System.Reactive.Disposables; using System.Windows; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs index 4b4ee80b..211b9430 100644 --- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs @@ -3,7 +3,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Input; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs index a9292a9d..744a416d 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs @@ -11,7 +11,7 @@ using System.Windows.Interop; using System.Windows.Media; using v2rayN.Base; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.Resx; using v2rayN.ViewModels; using Point = System.Windows.Point; diff --git a/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayN/v2rayN/Views/MsgView.xaml.cs index 293a2d2f..f6cac112 100644 --- a/v2rayN/v2rayN/Views/MsgView.xaml.cs +++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs @@ -3,7 +3,7 @@ using System.Reactive.Linq; using System.Text.RegularExpressions; using System.Windows.Threading; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; namespace v2rayN.Views { diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs index c4f0ee22..4a9482ce 100644 --- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs @@ -5,7 +5,7 @@ using System.Reactive.Disposables; using System.Windows; using System.Windows.Media; using v2rayN.Handler; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs index 9d90142a..94198939 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs @@ -1,7 +1,7 @@ using ReactiveUI; using System.Reactive.Disposables; using System.Windows; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs index fe4751b8..0293bfae 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs @@ -2,7 +2,7 @@ using System.Reactive.Disposables; using System.Windows; using System.Windows.Input; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs index 90d86556..7ff49a5a 100644 --- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs @@ -2,7 +2,7 @@ using System.Reactive.Disposables; using System.Windows; using System.Windows.Input; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs index fe90a398..5cb7ab70 100644 --- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs @@ -1,7 +1,7 @@ using ReactiveUI; using System.Reactive.Disposables; using System.Windows; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs index 8ff2c9ed..c6a37dce 100644 --- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Reactive.Disposables; using System.Windows; using System.Windows.Input; -using v2rayN.Model; +using v2rayN.Models; using v2rayN.ViewModels; namespace v2rayN.Views