From 56c3c225682839953b36f5a37144e6e34f905b2e Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Sun, 15 Mar 2020 03:24:43 +0800 Subject: [PATCH] =?UTF-8?q?IDE0001-=E7=AE=80=E5=8C=96=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2rayN/v2rayN/Base/ListViewFlickerFree.cs | 2 +- v2rayN/v2rayN/Handler/ConfigHandler.cs | 8 ++++---- v2rayN/v2rayN/Handler/MainFormHandler.cs | 4 ++-- v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 16 ++++++++-------- v2rayN/v2rayN/Program.cs | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/v2rayN/v2rayN/Base/ListViewFlickerFree.cs b/v2rayN/v2rayN/Base/ListViewFlickerFree.cs index 7fc58205..6785959b 100644 --- a/v2rayN/v2rayN/Base/ListViewFlickerFree.cs +++ b/v2rayN/v2rayN/Base/ListViewFlickerFree.cs @@ -22,7 +22,7 @@ namespace v2rayN.Base int MaxWidth = 0; Graphics graphics = this.CreateGraphics(); Font font = this.Font; - ListView.ListViewItemCollection items = this.Items; + ListViewItemCollection items = this.Items; string str; int width; diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 2dd96ebc..c7c461f8 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -436,7 +436,7 @@ namespace v2rayN.Handler { return 0; } - VmessItem vmess = Utils.DeepCopy(config.vmess[index]); + VmessItem vmess = Utils.DeepCopy(config.vmess[index]); config.vmess.RemoveAt(index); config.vmess.Insert(0, vmess); if (index < config.index) @@ -459,7 +459,7 @@ namespace v2rayN.Handler { return 0; } - VmessItem vmess = Utils.DeepCopy(config.vmess[index]); + VmessItem vmess = Utils.DeepCopy(config.vmess[index]); config.vmess.RemoveAt(index); config.vmess.Insert(index - 1, vmess); if (index == config.index + 1) @@ -479,7 +479,7 @@ namespace v2rayN.Handler { return 0; } - VmessItem vmess = Utils.DeepCopy(config.vmess[index]); + VmessItem vmess = Utils.DeepCopy(config.vmess[index]); config.vmess.RemoveAt(index); config.vmess.Insert(index + 1, vmess); if (index == config.index - 1) @@ -498,7 +498,7 @@ namespace v2rayN.Handler { return 0; } - VmessItem vmess = Utils.DeepCopy(config.vmess[index]); + VmessItem vmess = Utils.DeepCopy(config.vmess[index]); config.vmess.RemoveAt(index); config.vmess.Add(vmess); if (index < config.index) diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs index d8043f02..c4b095b0 100644 --- a/v2rayN/v2rayN/Handler/MainFormHandler.cs +++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs @@ -100,7 +100,7 @@ namespace v2rayN.Handler { return; } - Config configCopy = Utils.DeepCopy(config); + Config configCopy = Utils.DeepCopy(config); configCopy.index = index; string msg; if (V2rayConfigHandler.Export2ClientConfig(configCopy, fileName, out msg) != 0) @@ -141,7 +141,7 @@ namespace v2rayN.Handler { return; } - Config configCopy = Utils.DeepCopy(config); + Config configCopy = Utils.DeepCopy(config); configCopy.index = index; string msg; if (V2rayConfigHandler.Export2ServerConfig(configCopy, fileName, out msg) != 0) diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs index c9288b65..b016947d 100644 --- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs @@ -660,9 +660,9 @@ namespace v2rayN.Handler if (config.enableStatistics) { var tag = Global.InboundAPITagName; - var apiObj = new Mode.API(); - var policyObj = new Mode.Policy(); - var policySystemSetting = new Mode.SystemPolicy(); + var apiObj = new API(); + var policyObj = new Policy(); + var policySystemSetting = new SystemPolicy(); string[] services = { "StatsService" }; @@ -679,8 +679,8 @@ namespace v2rayN.Handler if (!v2rayConfig.inbounds.Exists(item => { return item.tag == tag; })) { - var apiInbound = new Mode.Inbounds(); - var apiInboundSettings = new Mode.Inboundsettings(); + var apiInbound = new Inbounds(); + var apiInboundSettings = new Inboundsettings(); apiInbound.tag = tag; apiInbound.listen = Global.Loopback; apiInbound.port = Global.statePort; @@ -692,7 +692,7 @@ namespace v2rayN.Handler if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; })) { - var apiRoutingRule = new Mode.RulesItem + var apiRoutingRule = new RulesItem { inboundTag = new List { tag }, outboundTag = tag, @@ -1437,7 +1437,7 @@ namespace v2rayN.Handler msg = UIRes.I18N("InitialConfiguration"); - Config configCopy = Utils.DeepCopy(config); + Config configCopy = Utils.DeepCopy(config); string result = Utils.GetEmbedText(SampleClient); if (Utils.IsNullOrEmpty(result)) @@ -1483,7 +1483,7 @@ namespace v2rayN.Handler v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString(); v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]); - var rule = new Mode.RulesItem + var rule = new RulesItem { inboundTag = new List { inbound.tag }, outboundTag = v2rayConfigCopy.outbounds[0].tag, diff --git a/v2rayN/v2rayN/Program.cs b/v2rayN/v2rayN/Program.cs index e40749ef..c67bb345 100644 --- a/v2rayN/v2rayN/Program.cs +++ b/v2rayN/v2rayN/Program.cs @@ -26,7 +26,7 @@ namespace v2rayN } Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException); - Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException); + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); @@ -100,7 +100,7 @@ namespace v2rayN return null; } - static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) + static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) { Utils.SaveLog("Application_ThreadException", e.Exception); }