up4.11

v2rayN/v2rayN/Forms/MainForm.cs

@@ -1501,6 +1501,12 @@ namespace v2rayN.Forms
         /// </summary>
         private void RefreshRoutingsMenu()
         {
+            menuRoutings.Visible = config.enableRoutingAdvanced;
+            if (!config.enableRoutingAdvanced)
+            {
+                return;
+            }
+
             menuRoutings.DropDownItems.Clear();
 
             List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();

v2rayN/v2rayN/Forms/RoutingSettingForm.Designer.cs

@@ -32,9 +32,10 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingSettingForm));
             this.btnClose = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.labRoutingTips = new System.Windows.Forms.Label();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.labRoutingTips = new System.Windows.Forms.Label();
+            this.chkenableRoutingAdvanced = new System.Windows.Forms.CheckBox();
             this.linkLabelRoutingDoc = new System.Windows.Forms.LinkLabel();
             this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -42,8 +43,10 @@
             this.menuRemove = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSetDefaultRouting = new System.Windows.Forms.ToolStripMenuItem();
-            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.MenuItemAdvanced = new System.Windows.Forms.ToolStripMenuItem();
             this.menuServer = new System.Windows.Forms.MenuStrip();
+            this.MenuItemBasic = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuImportBasicRules = new System.Windows.Forms.ToolStripMenuItem();
             this.tabNormal = new System.Windows.Forms.TabControl();
             this.tabPageProxy = new System.Windows.Forms.TabPage();
             this.panel5 = new System.Windows.Forms.Panel();
@@ -87,19 +90,26 @@
             // 
             // btnClose
             // 
-            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.Name = "btnClose";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // panel2
             // 
-            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Controls.Add(this.labRoutingTips);
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
+            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
+            // labRoutingTips
+            // 
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
             // btnOK
             // 
             resources.ApplyResources(this.btnOK, "btnOK");
@@ -109,17 +119,18 @@
             // 
             // panel1
             // 
-            resources.ApplyResources(this.panel1, "panel1");
-            this.panel1.Controls.Add(this.labRoutingTips);
+            this.panel1.Controls.Add(this.chkenableRoutingAdvanced);
             this.panel1.Controls.Add(this.linkLabelRoutingDoc);
             this.panel1.Controls.Add(this.cmbdomainStrategy);
+            resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // labRoutingTips
+            // chkenableRoutingAdvanced
             // 
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            this.labRoutingTips.Name = "labRoutingTips";
+            resources.ApplyResources(this.chkenableRoutingAdvanced, "chkenableRoutingAdvanced");
+            this.chkenableRoutingAdvanced.Name = "chkenableRoutingAdvanced";
+            this.chkenableRoutingAdvanced.UseVisualStyleBackColor = true;
+            this.chkenableRoutingAdvanced.CheckedChanged += new System.EventHandler(this.chkenableRoutingAdvanced_CheckedChanged_1);
             // 
             // linkLabelRoutingDoc
             // 
@@ -130,18 +141,17 @@
             // 
             // cmbdomainStrategy
             // 
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbdomainStrategy.FormattingEnabled = true;
             this.cmbdomainStrategy.Items.AddRange(new object[] {
             resources.GetString("cmbdomainStrategy.Items"),
             resources.GetString("cmbdomainStrategy.Items1"),
             resources.GetString("cmbdomainStrategy.Items2")});
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.Name = "cmbdomainStrategy";
             // 
             // cmsLv
             // 
-            resources.ApplyResources(this.cmsLv, "cmsLv");
             this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuAdd,
@@ -149,74 +159,89 @@
             this.menuSelectAll,
             this.menuSetDefaultRouting});
             this.cmsLv.Name = "cmsLv";
-            this.cmsLv.OwnerItem = this.MenuItem1;
+            this.cmsLv.OwnerItem = this.MenuItemAdvanced;
+            resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAdd
             // 
-            resources.ApplyResources(this.menuAdd, "menuAdd");
             this.menuAdd.Name = "menuAdd";
+            resources.ApplyResources(this.menuAdd, "menuAdd");
             this.menuAdd.Click += new System.EventHandler(this.menuAdd_Click);
             // 
             // menuRemove
             // 
-            resources.ApplyResources(this.menuRemove, "menuRemove");
             this.menuRemove.Name = "menuRemove";
+            resources.ApplyResources(this.menuRemove, "menuRemove");
             this.menuRemove.Click += new System.EventHandler(this.menuRemove_Click);
             // 
             // menuSelectAll
             // 
-            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
             this.menuSelectAll.Name = "menuSelectAll";
+            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
             this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
             // 
             // menuSetDefaultRouting
             // 
-            resources.ApplyResources(this.menuSetDefaultRouting, "menuSetDefaultRouting");
             this.menuSetDefaultRouting.Name = "menuSetDefaultRouting";
+            resources.ApplyResources(this.menuSetDefaultRouting, "menuSetDefaultRouting");
             this.menuSetDefaultRouting.Click += new System.EventHandler(this.menuSetDefaultRouting_Click);
             // 
-            // MenuItem1
+            // MenuItemAdvanced
             // 
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
-            this.MenuItem1.DropDown = this.cmsLv;
-            this.MenuItem1.Name = "MenuItem1";
+            this.MenuItemAdvanced.DropDown = this.cmsLv;
+            this.MenuItemAdvanced.Name = "MenuItemAdvanced";
+            resources.ApplyResources(this.MenuItemAdvanced, "MenuItemAdvanced");
             // 
             // menuServer
             // 
-            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MenuItem1});
+            this.MenuItemBasic,
+            this.MenuItemAdvanced});
+            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Name = "menuServer";
             // 
+            // MenuItemBasic
+            // 
+            this.MenuItemBasic.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuImportBasicRules});
+            this.MenuItemBasic.Name = "MenuItemBasic";
+            resources.ApplyResources(this.MenuItemBasic, "MenuItemBasic");
+            // 
+            // menuImportBasicRules
+            // 
+            this.menuImportBasicRules.Name = "menuImportBasicRules";
+            resources.ApplyResources(this.menuImportBasicRules, "menuImportBasicRules");
+            this.menuImportBasicRules.Click += new System.EventHandler(this.menuImportBasicRules_Click);
+            // 
             // tabNormal
             // 
-            resources.ApplyResources(this.tabNormal, "tabNormal");
             this.tabNormal.Controls.Add(this.tabPageProxy);
             this.tabNormal.Controls.Add(this.tabPageDirect);
             this.tabNormal.Controls.Add(this.tabPageBlock);
             this.tabNormal.Controls.Add(this.tabPageRuleList);
+            resources.ApplyResources(this.tabNormal, "tabNormal");
             this.tabNormal.Name = "tabNormal";
             this.tabNormal.SelectedIndex = 0;
             this.tabNormal.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabNormal_Selecting);
             // 
             // tabPageProxy
             // 
-            resources.ApplyResources(this.tabPageProxy, "tabPageProxy");
             this.tabPageProxy.Controls.Add(this.panel5);
+            resources.ApplyResources(this.tabPageProxy, "tabPageProxy");
             this.tabPageProxy.Name = "tabPageProxy";
             this.tabPageProxy.UseVisualStyleBackColor = true;
             // 
             // panel5
             // 
-            resources.ApplyResources(this.panel5, "panel5");
             this.panel5.Controls.Add(this.groupBox5);
             this.panel5.Controls.Add(this.groupBox6);
+            resources.ApplyResources(this.panel5, "panel5");
             this.panel5.Name = "panel5";
             // 
             // groupBox5
             // 
-            resources.ApplyResources(this.groupBox5, "groupBox5");
             this.groupBox5.Controls.Add(this.txtProxyIp);
+            resources.ApplyResources(this.groupBox5, "groupBox5");
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.TabStop = false;
             // 
@@ -227,8 +252,8 @@
             // 
             // groupBox6
             // 
-            resources.ApplyResources(this.groupBox6, "groupBox6");
             this.groupBox6.Controls.Add(this.txtProxyDomain);
+            resources.ApplyResources(this.groupBox6, "groupBox6");
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.TabStop = false;
             // 
@@ -239,22 +264,22 @@
             // 
             // tabPageDirect
             // 
-            resources.ApplyResources(this.tabPageDirect, "tabPageDirect");
             this.tabPageDirect.Controls.Add(this.panel4);
+            resources.ApplyResources(this.tabPageDirect, "tabPageDirect");
             this.tabPageDirect.Name = "tabPageDirect";
             this.tabPageDirect.UseVisualStyleBackColor = true;
             // 
             // panel4
             // 
-            resources.ApplyResources(this.panel4, "panel4");
             this.panel4.Controls.Add(this.groupBox3);
             this.panel4.Controls.Add(this.groupBox4);
+            resources.ApplyResources(this.panel4, "panel4");
             this.panel4.Name = "panel4";
             // 
             // groupBox3
             // 
-            resources.ApplyResources(this.groupBox3, "groupBox3");
             this.groupBox3.Controls.Add(this.txtDirectIp);
+            resources.ApplyResources(this.groupBox3, "groupBox3");
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.TabStop = false;
             // 
@@ -265,8 +290,8 @@
             // 
             // groupBox4
             // 
-            resources.ApplyResources(this.groupBox4, "groupBox4");
             this.groupBox4.Controls.Add(this.txtDirectDomain);
+            resources.ApplyResources(this.groupBox4, "groupBox4");
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.TabStop = false;
             // 
@@ -277,22 +302,22 @@
             // 
             // tabPageBlock
             // 
-            resources.ApplyResources(this.tabPageBlock, "tabPageBlock");
             this.tabPageBlock.Controls.Add(this.panel3);
+            resources.ApplyResources(this.tabPageBlock, "tabPageBlock");
             this.tabPageBlock.Name = "tabPageBlock";
             this.tabPageBlock.UseVisualStyleBackColor = true;
             // 
             // panel3
             // 
-            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Controls.Add(this.groupBox2);
             this.panel3.Controls.Add(this.groupBox1);
+            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Name = "panel3";
             // 
             // groupBox2
             // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.txtBlockIp);
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
@@ -303,8 +328,8 @@
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.txtBlockDomain);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
@@ -315,15 +340,15 @@
             // 
             // tabPageRuleList
             // 
-            resources.ApplyResources(this.tabPageRuleList, "tabPageRuleList");
             this.tabPageRuleList.Controls.Add(this.lvRoutings);
+            resources.ApplyResources(this.tabPageRuleList, "tabPageRuleList");
             this.tabPageRuleList.Name = "tabPageRuleList";
             this.tabPageRuleList.UseVisualStyleBackColor = true;
             // 
             // lvRoutings
             // 
-            resources.ApplyResources(this.lvRoutings, "lvRoutings");
             this.lvRoutings.ContextMenuStrip = this.cmsLv;
+            resources.ApplyResources(this.lvRoutings, "lvRoutings");
             this.lvRoutings.FullRowSelect = true;
             this.lvRoutings.GridLines = true;
             this.lvRoutings.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -391,7 +416,7 @@
         private System.Windows.Forms.ToolStripMenuItem menuSelectAll;
         private System.Windows.Forms.ToolStripMenuItem menuAdd;
         private System.Windows.Forms.MenuStrip menuServer;
-        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemAdvanced;
         private System.Windows.Forms.ToolStripMenuItem menuSetDefaultRouting;
         private System.Windows.Forms.TabControl tabNormal;
         private System.Windows.Forms.TabPage tabPageProxy;
@@ -415,5 +440,8 @@
         private System.Windows.Forms.TabPage tabPageRuleList;
         private Base.ListViewFlickerFree lvRoutings;
         private System.Windows.Forms.Label labRoutingTips;
+        private System.Windows.Forms.CheckBox chkenableRoutingAdvanced;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemBasic;
+        private System.Windows.Forms.ToolStripMenuItem menuImportBasicRules;
     }
 }

v2rayN/v2rayN/Forms/RoutingSettingForm.cs

@@ -21,6 +21,7 @@ namespace v2rayN.Forms
             ConfigHandler.InitBuiltinRouting(ref config);
 
             cmbdomainStrategy.Text = config.domainStrategy;
+            chkenableRoutingAdvanced.Checked = config.enableRoutingAdvanced;
 
             if (config.routings == null)
             {
@@ -30,24 +31,25 @@ namespace v2rayN.Forms
             RefreshRoutingsView();
 
             BindingLockedData();
-
-        }      
+            InitUI();
+        }
 
 
         private void tabNormal_Selecting(object sender, TabControlCancelEventArgs e)
         {
-            if (tabNormal.SelectedTab == tabPageRuleList)
-            {
-                MenuItem1.Enabled = true;
-            }
-            else
-            {
-                MenuItem1.Enabled = false;
-            }
+            //if (tabNormal.SelectedTab == tabPageRuleList)
+            //{
+            //    MenuItem1.Enabled = true;
+            //}
+            //else
+            //{
+            //    MenuItem1.Enabled = false;
+            //}
         }
         private void btnOK_Click(object sender, EventArgs e)
         {
             config.domainStrategy = cmbdomainStrategy.Text;
+            config.enableRoutingAdvanced = chkenableRoutingAdvanced.Checked;
             EndBindingLockedData();
 
             if (ConfigHandler.SaveRouting(ref config) == 0)
@@ -64,6 +66,33 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
+        private void chkenableRoutingAdvanced_CheckedChanged_1(object sender, EventArgs e)
+        {
+            InitUI();
+        }
+        private void InitUI()
+        {
+            if (chkenableRoutingAdvanced.Checked)
+            {
+                this.tabPageProxy.Parent = null;
+                this.tabPageDirect.Parent = null;
+                this.tabPageBlock.Parent = null;
+                this.tabPageRuleList.Parent = tabNormal;
+                MenuItemBasic.Enabled = false;
+                MenuItemAdvanced.Enabled = true;
+
+            }
+            else
+            {
+                this.tabPageProxy.Parent = tabNormal;
+                this.tabPageDirect.Parent = tabNormal;
+                this.tabPageBlock.Parent = tabNormal;
+                this.tabPageRuleList.Parent = null;
+                MenuItemBasic.Enabled = true;
+                MenuItemAdvanced.Enabled = false;
+            }
+
+        }
 
 
         #region locked
@@ -94,6 +123,7 @@ namespace v2rayN.Forms
 
                 lockedItem.rules[2].domain = Utils.String2List(txtBlockDomain.Text.TrimEx());
                 lockedItem.rules[2].ip = Utils.String2List(txtBlockIp.Text.TrimEx());
+
             }
         }
         #endregion
@@ -136,7 +166,7 @@ namespace v2rayN.Forms
                 {
                     def = "√";
                 }
-                               
+
                 ListViewItem lvItem = new ListViewItem(def);
                 Utils.AddSubItem(lvItem, "remarks", item.remarks);
                 Utils.AddSubItem(lvItem, "count", item.rules.Count.ToString());
@@ -257,6 +287,14 @@ namespace v2rayN.Forms
             return 0;
         }
 
+        private void menuImportBasicRules_Click(object sender, EventArgs e)
+        {
+            //Extra to bypass the mainland
+            txtDirectDomain.Text = "geosite:cn";
+            txtDirectIp.Text = "geoip:private,geoip:cn";
+
+            txtBlockDomain.Text = "geosite:category-ads-all";
+        }
 
         #endregion
 

v2rayN/v2rayN/Forms/RoutingSettingForm.zh-Hans.resx

@@ -117,13 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>691, 17</value>
+  </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 545</value>
   </data>
@@ -136,14 +136,29 @@
   <data name="labRoutingTips.Text" xml:space="preserve">
     <value>*设置的路由规则,用逗号(,)分隔;正则中的逗号用&lt;COMMA&gt;替代</value>
   </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>598, 17</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>817, 51</value>
+  </data>
+  <data name="chkenableRoutingAdvanced.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 16</value>
+  </data>
+  <data name="chkenableRoutingAdvanced.Text" xml:space="preserve">
+    <value>启用路由高级功能</value>
+  </data>
   <data name="linkLabelRoutingDoc.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 12</value>
   </data>
   <data name="linkLabelRoutingDoc.Text" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>817, 51</value>
+  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 92</value>
   </data>
   <data name="menuAdd.Size" type="System.Drawing.Size, System.Drawing">
     <value>148, 22</value>
@@ -169,32 +184,29 @@
   <data name="menuSetDefaultRouting.Text" xml:space="preserve">
     <value>设为活动路由</value>
   </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 21</value>
+  <data name="MenuItemAdvanced.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
   </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>路由规则集功能</value>
-  </data>
-  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 92</value>
+  <data name="MenuItemAdvanced.Text" xml:space="preserve">
+    <value>高级功能</value>
   </data>
   <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
     <value>817, 25</value>
   </data>
-  <data name="txtProxyIp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 417</value>
+  <data name="MenuItemBasic.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
   </data>
-  <data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>411, 437</value>
+  <data name="MenuItemBasic.Text" xml:space="preserve">
+    <value>基础功能</value>
   </data>
-  <data name="txtProxyDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 417</value>
+  <data name="menuImportBasicRules.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 22</value>
   </data>
-  <data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>392, 437</value>
+  <data name="menuImportBasicRules.Text" xml:space="preserve">
+    <value>一键导入基础规则</value>
   </data>
-  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>803, 437</value>
+  <data name="tabNormal.Size" type="System.Drawing.Size, System.Drawing">
+    <value>817, 469</value>
   </data>
   <data name="tabPageProxy.Size" type="System.Drawing.Size, System.Drawing">
     <value>809, 443</value>
@@ -202,20 +214,20 @@
   <data name="tabPageProxy.Text" xml:space="preserve">
     <value>  1.代理的Domain或IP  </value>
   </data>
-  <data name="txtDirectIp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 417</value>
+  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
   </data>
-  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
     <value>411, 437</value>
   </data>
-  <data name="txtDirectDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 417</value>
+  <data name="txtProxyIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
   </data>
-  <data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
     <value>392, 437</value>
   </data>
-  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>803, 437</value>
+  <data name="txtProxyDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
   </data>
   <data name="tabPageDirect.Size" type="System.Drawing.Size, System.Drawing">
     <value>809, 443</value>
@@ -223,20 +235,20 @@
   <data name="tabPageDirect.Text" xml:space="preserve">
     <value>  2.直连的Domain或IP  </value>
   </data>
-  <data name="txtBlockIp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 417</value>
+  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
   </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
     <value>411, 437</value>
   </data>
-  <data name="txtBlockDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 417</value>
+  <data name="txtDirectIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
     <value>392, 437</value>
   </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>803, 437</value>
+  <data name="txtDirectDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
   </data>
   <data name="tabPageBlock.Size" type="System.Drawing.Size, System.Drawing">
     <value>809, 443</value>
@@ -244,6 +256,27 @@
   <data name="tabPageBlock.Text" xml:space="preserve">
     <value>  3.阻止的Domain或IP  </value>
   </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>411, 437</value>
+  </data>
+  <data name="txtBlockIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>392, 437</value>
+  </data>
+  <data name="txtBlockDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
+  </data>
+  <data name="tabPageRuleList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>809, 443</value>
+  </data>
+  <data name="tabPageRuleList.Text" xml:space="preserve">
+    <value>  预定义规则集列表</value>
+  </data>
   <data name="lvRoutings.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -264,15 +297,6 @@
   <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
     <value>803, 437</value>
   </data>
-  <data name="tabPageRuleList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>809, 443</value>
-  </data>
-  <data name="tabPageRuleList.Text" xml:space="preserve">
-    <value>  4.预定义规则集列表</value>
-  </data>
-  <data name="tabNormal.Size" type="System.Drawing.Size, System.Drawing">
-    <value>817, 469</value>
-  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>817, 605</value>
   </data>

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,6 @@
 
+using System.Collections.Generic;
+
 namespace v2rayN
 {
     class Global
@@ -190,6 +192,8 @@ namespace v2rayN
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
 
         public const string RoutingRuleComma = "<COMMA>";
+
+        public static readonly IEnumerable<string> ssSecuritys = new HashSet<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
         #endregion
 
         #region 全局变量

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -528,8 +528,7 @@ namespace v2rayN.Handler
             vmessItem.id = vmessItem.id.TrimEx();
             vmessItem.security = vmessItem.security.TrimEx();
 
-            var securitys = new HashSet<string>() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-            if (!securitys.Contains(vmessItem.security))
+            if (!Global.ssSecuritys.Contains(vmessItem.security))
             {
                 return -1;
             }

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -190,19 +190,25 @@ namespace v2rayN.Handler
                 {
                     v2rayConfig.routing.domainStrategy = config.domainStrategy;
 
-                    var lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
-                    if (lockedItem != null)
+                    if (config.enableRoutingAdvanced)
                     {
-                        foreach (var item in lockedItem.rules)
+                        if (config.routings != null && config.routingIndex < config.routings.Count)
                         {
-                            routingUserRule(item, ref v2rayConfig);
+                            foreach (var item in config.routings[config.routingIndex].rules)
+                            {
+                                routingUserRule(item, ref v2rayConfig);
+                            }
                         }
                     }
-                    if (config.routings != null && config.routingIndex < config.routings.Count)
+                    else
                     {
-                        foreach (var item in config.routings[config.routingIndex].rules)
+                        var lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
+                        if (lockedItem != null)
                         {
-                            routingUserRule(item, ref v2rayConfig);
+                            foreach (var item in lockedItem.rules)
+                            {
+                                routingUserRule(item, ref v2rayConfig);
+                            }                         
                         }
                     }
                 }
@@ -378,7 +384,15 @@ namespace v2rayN.Handler
                     serversItem.address = config.address();
                     serversItem.port = config.port();
                     serversItem.password = config.id();
-                    serversItem.method = config.security();
+                    if (Global.ssSecuritys.Contains(config.security()))
+                    {
+                        serversItem.method = config.security();
+                    }
+                    else
+                    {
+                        serversItem.method = "none";
+                    }
+
 
                     serversItem.ota = false;
                     serversItem.level = 1;

v2rayN/v2rayN/Mode/Config.cs

@@ -169,7 +169,11 @@ namespace v2rayN.Mode
         {
             get; set;
         }
-      
+        public bool enableRoutingAdvanced
+        {
+            get; set;
+        }
+
         public ECoreType coreType
         {
             get; set;

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("4.9")]
+[assembly: AssemblyFileVersion("4.11")]

v2rayN/v2rayN/Sample/custom_routing_locked

@@ -8,8 +8,8 @@
   {
     "outboundTag": "direct",
     "domain": [
-      "domain:example.com",
-      "domain:example2.com"
+      "domain:example-example.com",
+      "domain:example-example2.com"
     ]
   },
   {

v2rayN/v2rayN/Sample/custom_routing_white

@@ -2,8 +2,8 @@
   {
     "outboundTag": "direct",
     "domain": [
-      "domain:example.com",
-      "domain:example2.com"
+      "domain:example-example.com",
+      "domain:example-example2.com"
     ]
   },
   {