From ca9840abf42fbfb079ea7b1c2a76a295a3299bdc Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Sat, 18 Apr 2020 13:21:47 +0800
Subject: [PATCH] code style

---
 v2rayN/v2rayN/Base/WebClientEx.cs             |   5 +-
 v2rayN/v2rayN/Forms/OptionSettingForm.cs      |  10 +-
 v2rayN/v2rayN/Global.cs                       |  40 +--
 v2rayN/v2rayN/Handler/StatisticsHandler.cs    |  10 +-
 .../v2rayN/HttpProxyHandler/PrivoxyHandler.cs |   5 +-
 v2rayN/v2rayN/Mode/Config.cs                  | 289 ++++--------------
 v2rayN/v2rayN/Mode/ServerStatistics.cs        |  35 +--
 v2rayN/v2rayN/Mode/VmessQRCode.cs             |  22 +-
 8 files changed, 89 insertions(+), 327 deletions(-)

diff --git a/v2rayN/v2rayN/Base/WebClientEx.cs b/v2rayN/v2rayN/Base/WebClientEx.cs
index 096826cc..e581575c 100644
--- a/v2rayN/v2rayN/Base/WebClientEx.cs
+++ b/v2rayN/v2rayN/Base/WebClientEx.cs
@@ -5,10 +5,7 @@ namespace v2rayN.Base
 {
     class WebClientEx : WebClient
     {
-        public int Timeout
-        {
-            get; set;
-        }
+        public int Timeout { get; set; }
         public WebClientEx(int timeout = 3000)
         {
             Timeout = timeout;
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
index 1d4394a8..4d16a860 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -458,13 +458,7 @@ namespace v2rayN.Forms
 
     class ComboItem
     {
-        public int ID
-        {
-            get; set;
-        }
-        public string Text
-        {
-            get; set;
-        }
+        public int ID { get; set; }
+        public string Text { get; set; }
     }
 }
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 862910fa..3d1e6137 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -173,59 +173,35 @@ namespace v2rayN
         /// <summary>
         /// 是否需要重启服务V2ray。如果为假，LoadV2ray()不做任何事。
         /// </summary>
-        public static bool reloadV2ray
-        {
-            get; set;
-        }
+        public static bool reloadV2ray { get; set; }
 
         /// <summary>
         /// 是否开启全局代理(http)
         /// </summary>
-        public static bool sysAgent
-        {
-            get; set;
-        }
+        public static bool sysAgent { get; set; }
 
         /// <summary>
         /// socks端口
         /// </summary>
-        public static int socksPort
-        {
-            get; set;
-        }
+        public static int socksPort { get; set; }
 
         /// <summary>
         /// http端口
         /// </summary>
-        public static int httpPort
-        {
-            get; set;
-        }
+        public static int httpPort { get; set; }
 
         /// <summary>
         /// PAC端口
         /// </summary>
-        public static int pacPort
-        {
-            get; set;
-        }
+        public static int pacPort { get; set; }
 
         /// <summary>
         ///  
         /// </summary>
-        public static int statePort
-        {
-            get; set;
-        }
+        public static int statePort { get; set; }
 
-        public static Job processJob
-        {
-            get; set;
-        }
-        public static System.Threading.Mutex mutexObj
-        {
-            get; set;
-        }
+        public static Job processJob { get; set; }
+        public static System.Threading.Mutex mutexObj { get; set; }
 
         #endregion
 
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index ab4d4a6a..bed9298b 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -20,15 +20,9 @@ namespace v2rayN.Handler
 
         Action<ulong, ulong, List<ServerStatItem>> updateFunc_;
 
-        public bool Enable
-        {
-            get; set;
-        }
+        public bool Enable { get; set; }
 
-        public bool UpdateUI
-        {
-            get; set;
-        }
+        public bool UpdateUI { get; set; }
 
         public List<ServerStatItem> Statistic
         {
diff --git a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
index f738a318..310054f0 100644
--- a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
@@ -55,10 +55,7 @@ namespace v2rayN.HttpProxyHandler
             }
         }
 
-        public int RunningPort
-        {
-            get; set;
-        }
+        public int RunningPort { get; set; }
 
         public void Restart(int localPort, Config config)
         {
diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs
index 0e213609..65f74893 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -15,205 +15,127 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听
         /// </summary>
-        public List<InItem> inbound
-        {
-            get; set;
-        }
+        public List<InItem> inbound { get; set; }
 
         /// <summary>
         /// 允许日志
         /// </summary>
-        public bool logEnabled
-        {
-            get; set;
-        }
+        public bool logEnabled { get; set; }
 
         /// <summary>
         /// 日志等级
         /// </summary>
-        public string loglevel
-        {
-            get; set;
-        }
+        public string loglevel { get; set; }
 
         /// <summary>
         /// 活动配置序号
         /// </summary>
-        public int index
-        {
-            get; set;
-        }
+        public int index { get; set; }
 
         /// <summary>
         /// vmess服务器信息
         /// </summary>
-        public List<VmessItem> vmess
-        {
-            get; set;
-        }
+        public List<VmessItem> vmess { get; set; }
 
         /// <summary>
         /// 允许Mux多路复用
         /// </summary>
-        public bool muxEnabled
-        {
-            get; set;
-        }
+        public bool muxEnabled { get; set; }
 
         /// <summary>
         /// 域名解析策略
         /// </summary>
-        public string domainStrategy
-        {
-            get; set;
-        }
+        public string domainStrategy { get; set; }
 
         /// <summary>
         /// 路由模式
         /// </summary>
-        public int routingMode
-        {
-            get; set;
-        }
+        public int routingMode { get; set; }
 
         /// <summary>
         /// 用户自定义需代理的网址或ip
         /// </summary>
-        public List<string> useragent
-        {
-            get; set;
-        }
+        public List<string> useragent { get; set; }
 
         /// <summary>
         /// 用户自定义直连的网址或ip
         /// </summary>
-        public List<string> userdirect
-        {
-            get; set;
-        }
+        public List<string> userdirect { get; set; }
 
         /// <summary>
         /// 用户自定义阻止的网址或ip
         /// </summary>
-        public List<string> userblock
-        {
-            get; set;
-        }
+        public List<string> userblock { get; set; }
 
         /// <summary>
         /// KcpItem
         /// </summary>
-        public KcpItem kcpItem
-        {
-            get; set;
-        }
+        public KcpItem kcpItem { get; set; }
 
         /// <summary>
         /// 监听状态
         /// </summary>
-        public ListenerType listenerType
-        {
-            get; set;
-        }
+        public ListenerType listenerType { get; set; }
 
         /// <summary>
         /// 自定义服务器下载测速url
         /// </summary>
-        public string speedTestUrl
-        {
-            get; set;
-        }
+        public string speedTestUrl { get; set; }
         /// <summary>
         /// 自定义“服务器真连接延迟”测试url
         /// </summary>
-        public string speedPingTestUrl
-        {
-            get; set;
-        }
+        public string speedPingTestUrl { get; set; }
         /// <summary>
         /// 自定义GFWList url
         /// </summary>
-        public string urlGFWList
-        {
-            get; set;
-        }
+        public string urlGFWList { get; set; }
 
         /// <summary>
         /// 允许来自局域网的连接
         /// </summary>
-        public bool allowLANConn
-        {
-            get; set;
-        }
+        public bool allowLANConn { get; set; }
 
         /// <summary>
         /// 启用实时网速和流量统计
         /// </summary>
-        public bool enableStatistics
-        {
-            get; set;
-        }
+        public bool enableStatistics { get; set; }
 
         /// <summary>
         /// 去重时优先保留较旧（顶部）节点
         /// </summary>
-        public bool keepOlderDedupl
-        {
-            get; set;
-        }
+        public bool keepOlderDedupl { get; set; }
 
         /// <summary>
         /// 服务器列表隔行着色
         /// </summary>
-        public bool interlaceColoring
-        {
-            get; set;
-        }
+        public bool interlaceColoring { get; set; }
 
         /// <summary>
         /// 视图刷新率
         /// </summary>
-        public int statisticsFreshRate
-        {
-            get; set;
-        }
+        public int statisticsFreshRate { get; set; }
 
 
         /// <summary>
         /// 自定义远程DNS
         /// </summary>
-        public string remoteDNS
-        {
-            get; set;
-        }
+        public string remoteDNS { get; set; }
 
         /// <summary>
         /// 是否允许不安全连接
         /// </summary>
-        public string defaultAllowInsecure
-        {
-            get; set;
-        }
+        public string defaultAllowInsecure { get; set; }
 
         /// <summary>
         /// 订阅
         /// </summary>
-        public List<SubItem> subItem
-        {
-            get; set;
-        }
+        public List<SubItem> subItem { get; set; }
         /// <summary>
         /// UI
         /// </summary>
-        public UIItem uiItem
-        {
-            get; set;
-        }
+        public UIItem uiItem { get; set; }
 
-        public List<string> userPacRule
-        {
-            get; set;
-        }
+        public List<string> userPacRule { get; set; }
 
         #region 函数
 
@@ -467,125 +389,77 @@ namespace v2rayN.Mode
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
-        public int configVersion
-        {
-            get; set;
-        }
+        public int configVersion { get; set; }
 
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string address
-        {
-            get; set;
-        }
+        public string address { get; set; }
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public int port
-        {
-            get; set;
-        }
+        public int port { get; set; }
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id
-        {
-            get; set;
-        }
+        public string id { get; set; }
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public int alterId
-        {
-            get; set;
-        }
+        public int alterId { get; set; }
         /// <summary>
         /// 本地安全策略
         /// </summary>
-        public string security
-        {
-            get; set;
-        }
+        public string security { get; set; }
         /// <summary>
         /// tcp,kcp,ws,h2,quic
         /// </summary>
-        public string network
-        {
-            get; set;
-        }
+        public string network { get; set; }
         /// <summary>
         /// 备注或别名
         /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
+        public string remarks { get; set; }
 
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string headerType
-        {
-            get; set;
-        }
+        public string headerType { get; set; }
 
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string requestHost
-        {
-            get; set;
-        }
+        public string requestHost { get; set; }
 
         /// <summary>
         /// ws h2 path
         /// </summary>
-        public string path
-        {
-            get; set;
-        }
+        public string path { get; set; }
 
         /// <summary>
         /// 底层传输安全
         /// </summary>
-        public string streamSecurity
-        {
-            get; set;
-        }
+        public string streamSecurity { get; set; }
 
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public string allowInsecure
-        {
-            get; set;
-        }
+        public string allowInsecure { get; set; }
 
 
         /// <summary>
         /// config type(1=normal,2=custom)
         /// </summary>
-        public int configType
-        {
-            get; set;
-        }
+        public int configType { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
-        public string testResult
-        {
-            get; set;
-        }
+        public string testResult { get; set; }
 
         /// <summary>
         /// SubItem id
         /// </summary>
-        public string subid
-        {
-            get; set;
-        }
+        public string subid { get; set; }
     }
 
     [Serializable]
@@ -594,26 +468,17 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听端口
         /// </summary>
-        public int localPort
-        {
-            get; set;
-        }
+        public int localPort { get; set; }
 
         /// <summary>
         /// 协议，默认为socks
         /// </summary>
-        public string protocol
-        {
-            get; set;
-        }
+        public string protocol { get; set; }
 
         /// <summary>
         /// 允许udp
         /// </summary>
-        public bool udpEnabled
-        {
-            get; set;
-        }
+        public bool udpEnabled { get; set; }
 
         /// <summary>
         /// 开启流量探测
@@ -627,52 +492,31 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public int mtu
-        {
-            get; set;
-        }
+        public int mtu { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int tti
-        {
-            get; set;
-        }
+        public int tti { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int uplinkCapacity
-        {
-            get; set;
-        }
+        public int uplinkCapacity { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int downlinkCapacity
-        {
-            get; set;
-        }
+        public int downlinkCapacity { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public bool congestion
-        {
-            get; set;
-        }
+        public bool congestion { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int readBufferSize
-        {
-            get; set;
-        }
+        public int readBufferSize { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int writeBufferSize
-        {
-            get; set;
-        }
+        public int writeBufferSize { get; set; }
     }
 
 
@@ -682,27 +526,15 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public string id
-        {
-            get; set;
-        }
-
+        public string id { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
-
+        public string remarks { get; set; }
         /// <summary>
         /// url
         /// </summary>
-        public string url
-        {
-            get; set;
-        }
-
+        public string url { get; set; }
         /// <summary>
         /// enable
         /// </summary>
@@ -714,14 +546,7 @@ namespace v2rayN.Mode
     {
          
 
-        public System.Drawing.Size mainSize
-        {
-            get; set;
-        }
-
-        public Dictionary<string, int> mainLvColWidth
-        {
-            get; set;
-        }
+        public System.Drawing.Size mainSize { get; set; }
+        public Dictionary<string, int> mainLvColWidth { get; set; }
     }
 }
diff --git a/v2rayN/v2rayN/Mode/ServerStatistics.cs b/v2rayN/v2rayN/Mode/ServerStatistics.cs
index e4a42a5a..f6c655d2 100644
--- a/v2rayN/v2rayN/Mode/ServerStatistics.cs
+++ b/v2rayN/v2rayN/Mode/ServerStatistics.cs
@@ -6,38 +6,17 @@ namespace v2rayN.Mode
     [Serializable]
     public class ServerStatistics
     {
-        public List<ServerStatItem> server
-        {
-            get; set;
-        }
+        public List<ServerStatItem> server { get; set; }
     }
 
     [Serializable]
     public class ServerStatItem
     {
-        public string itemId
-        {
-            get; set;
-        }
-        public ulong totalUp
-        {
-            get; set;
-        }
-        public ulong totalDown
-        {
-            get; set;
-        }
-        public ulong todayUp
-        {
-            get; set;
-        }
-        public ulong todayDown
-        {
-            get; set;
-        }
-        public long dateNow
-        {
-            get; set;
-        }
+        public string itemId { get; set; }
+        public ulong totalUp { get; set; }
+        public ulong totalDown { get; set; }
+        public ulong todayUp { get; set; }
+        public ulong todayDown { get; set; }
+        public long dateNow { get; set; }
     }
 }
diff --git a/v2rayN/v2rayN/Mode/VmessQRCode.cs b/v2rayN/v2rayN/Mode/VmessQRCode.cs
index 0a9cc8ab..4c5cb520 100644
--- a/v2rayN/v2rayN/Mode/VmessQRCode.cs
+++ b/v2rayN/v2rayN/Mode/VmessQRCode.cs
@@ -8,46 +8,46 @@ namespace v2rayN.Mode
         /// <summary>
         /// 版本
         /// </summary>
-        public string v { get; set; } = string.Empty;
+        public string v { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
-        public string ps { get; set; } = string.Empty;
+        public string ps { get; set; }
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string add { get; set; } = string.Empty;
+        public string add { get; set; }
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public string port { get; set; } = string.Empty;
+        public string port { get; set; }
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id { get; set; } = string.Empty;
+        public string id { get; set; }
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public string aid { get; set; } = string.Empty;
+        public string aid { get; set; }
         /// <summary>
         /// 传输协议tcp,kcp,ws
         /// </summary>
-        public string net { get; set; } = string.Empty;
+        public string net { get; set; }
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string type { get; set; } = string.Empty;
+        public string type { get; set; }
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string host { get; set; } = string.Empty;
+        public string host { get; set; }
         /// <summary>
         /// path
         /// </summary>
-        public string path { get; set; } = string.Empty;
+        public string path { get; set; }
         /// <summary>
         /// 底层传输安全
         /// </summary>
-        public string tls { get; set; } = string.Empty;
+        public string tls { get; set; }
     }    
 }