update config issue

Fixed the problem that the firewall could not open the quic port

.gitignore

@@ -199,3 +199,4 @@ FakesAssemblies/
 # vs code
 .vscode/*
 /ProxySU_Core/Data/Record.json
+/ProxySuper.WPF/bin

ProxySuper.Core/Models/Hosts/Host.cs

@@ -28,6 +28,8 @@ namespace ProxySuper.Core.Models.Hosts
 
         public string PrivateKeyPath { get; set; }
 
+        public string PrivateKeyPassPhrase { get; set; }
+
         public LocalProxy Proxy { get; set; }
 
         public LoginSecretType SecretType { get; set; }

ProxySuper.Core/Models/Projects/HysteriaSettings.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProxySuper.Core.Models.Projects
+{
+    public class HysteriaSettings : IProjectSettings
+    {
+        public string Domain { get; set; } = "";
+
+        public string Obfs { get; set; } = "";
+
+        public string Email { get; set; } = "";
+
+        public string Protocol { get; set; } = "udp";
+
+        public int Port { get; set; } = 36712;
+
+        public int UpMbps { get; set; } = 300;
+
+        public int DownMbps { get; set; } = 300;
+
+        public List<int> FreePorts
+        {
+            get
+            {
+                return new List<int> { Port, 80 };
+            }
+        }
+    }
+}

ProxySuper.Core/Models/Projects/ProjectType.cs

@@ -8,5 +8,6 @@
         Brook = 3,
         V2ray = 4,
         MTProtoGo = 5,
+        Hysteria = 6,
     }
 }

ProxySuper.Core/Models/Projects/RayType.cs

@@ -10,6 +10,7 @@
         VLESS_WS = 102,
         VLESS_H2 = 103,
         VLESS_KCP = 104,
+        VLESS_QUIC = 105,
         VLESS_gRPC = 110,
 
         // VMESS 201开头
@@ -17,6 +18,7 @@
         VMESS_WS = 202,
         VMESS_H2 = 203,
         VMESS_KCP = 204,
+        VMESS_QUIC = 205,
 
         // Trojan 301开头
         Trojan_TCP = 301,
@@ -26,5 +28,5 @@
         ShadowsocksAEAD = 401
     }
 
-    
+
 }

ProxySuper.Core/Models/Projects/V2raySettings.cs

@@ -9,6 +9,15 @@ namespace ProxySuper.Core.Models.Projects
 {
     public partial class V2raySettings : IProjectSettings
     {
+        public static List<string> DisguiseTypes = new List<string> {
+            "none",
+            "srtp",
+            "utp",
+            "wechat-video",
+            "dtls",
+            "wireguard",
+        };
+
         public V2raySettings()
         {
             WithTLS = true;
@@ -16,8 +25,11 @@ namespace ProxySuper.Core.Models.Projects
             var guid = Guid.NewGuid().ToString();
             Port = 443;
             VLESS_KCP_Port = 2001;
-            VLESS_gRPC_Port = 2002;
+            VLESS_QUIC_Port = 2002;
+            VLESS_gRPC_Port = 2003;
+
             VMESS_KCP_Port = 3001;
+            VMESS_QUIC_Port = 3002;
             ShadowSocksPort = 4001;
 
             UUID = guid;
@@ -26,12 +38,19 @@ namespace ProxySuper.Core.Models.Projects
             VLESS_WS_Path = "/" + Utils.RandomString(6);
             VLESS_KCP_Type = "none";
             VLESS_KCP_Seed = guid;
-            VLESS_gRPC_ServiceName = "/" + Utils.RandomString(7);
+            VLESS_QUIC_Key = "";
+            VLESS_QUIC_Type = "none";
+            VLESS_QUIC_Security = "none";
+            VLESS_QUIC_Type = "none";
+            VLESS_gRPC_ServiceName = Utils.RandomString(7);
 
             VMESS_WS_Path = "/" + Utils.RandomString(8);
             VMESS_TCP_Path = "/" + Utils.RandomString(9);
             VMESS_KCP_Seed = guid;
+            VMESS_QUIC_Key = "";
             VMESS_KCP_Type = "none";
+            VMESS_QUIC_Security = "none";
+            VMESS_QUIC_Type = "none";
 
             TrojanPassword = guid;
 
@@ -62,11 +81,21 @@ namespace ProxySuper.Core.Models.Projects
                     list.Add(VLESS_KCP_Port);
                 }
 
+                if (Types.Contains(RayType.VLESS_QUIC))
+                {
+                    list.Add(VLESS_QUIC_Port);
+                }
+
                 if (Types.Contains(RayType.VMESS_KCP))
                 {
                     list.Add(VMESS_KCP_Port);
                 }
 
+                if (Types.Contains(RayType.VMESS_QUIC))
+                {
+                    list.Add(VMESS_QUIC_Port);
+                }
+
                 if (Types.Contains(RayType.ShadowsocksAEAD))
                 {
                     list.Add(ShadowSocksPort);
@@ -81,8 +110,6 @@ namespace ProxySuper.Core.Models.Projects
             }
         }
 
-        //public ProjectType Type { get; set; } = ProjectType.Xray;
-
         /// <summary>
         /// 是否安装证书，
         /// 上传自有证书时选False，则不会自动安装证书。

ProxySuper.Core/Models/Projects/V2raySettings_SS.cs

@@ -19,6 +19,9 @@ namespace ProxySuper.Core.Models.Projects
         /// </summary>
         public int ShadowSocksPort { get; set; }
 
+        /// <summary>
+        /// share link
+        /// </summary>
         public string ShadowSocksShareLink
         {
             get

ProxySuper.Core/Models/Projects/V2raySettings_VLESS.cs

@@ -1,4 +1,7 @@
 using ProxySuper.Core.Services;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Documents;
 
 namespace ProxySuper.Core.Models.Projects
 {
@@ -57,6 +60,37 @@ namespace ProxySuper.Core.Models.Projects
             }
         }
 
+        /// <summary>
+        /// vless quic security
+        /// </summary>
+        public string VLESS_QUIC_Security { get; set; }
+
+        /// <summary>
+        /// vless quic type
+        /// </summary>
+        public string VLESS_QUIC_Type { get; set; }
+
+        /// <summary>
+        /// vless quic port
+        /// </summary>
+        public int VLESS_QUIC_Port { get; set; }
+
+        /// <summary>
+        /// vless quic key
+        /// </summary>
+        public string VLESS_QUIC_Key { get; set; }
+
+        /// <summary>
+        /// vless quic ShareLink
+        /// </summary>
+        public string VLESS_QUIC_ShareLink
+        {
+            get
+            {
+                return ShareLink.Build(RayType.VLESS_QUIC, this);
+            }
+        }
+
         /// <summary>
         /// grpc port
         /// </summary>

ProxySuper.Core/Models/Projects/V2raySettings_VMESS.cs

@@ -61,5 +61,36 @@ namespace ProxySuper.Core.Models.Projects
                 return ShareLink.Build(RayType.VMESS_KCP, this);
             }
         }
+
+        /// <summary>
+        /// vmess quic security
+        /// </summary>
+        public string VMESS_QUIC_Security { get; set; }
+
+        /// <summary>
+        /// vmess quic type
+        /// </summary>
+        public string VMESS_QUIC_Type { get; set; }
+
+        /// <summary>
+        /// vmess quic port
+        /// </summary>
+        public int VMESS_QUIC_Port { get; set; }
+
+        /// <summary>
+        /// vmess quic key
+        /// </summary>
+        public string VMESS_QUIC_Key { get; set; }
+
+        /// <summary>
+        /// vmess quic ShareLink
+        /// </summary>
+        public string VMESS_QUIC_ShareLink
+        {
+            get
+            {
+                return ShareLink.Build(RayType.VMESS_QUIC, this);
+            }
+        }
     }
 }

ProxySuper.Core/Models/Projects/XraySettings.cs

@@ -9,6 +9,15 @@ namespace ProxySuper.Core.Models.Projects
 {
     public class XraySettings : V2raySettings
     {
+        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized" };
+
+        //流控参数在服务端只有两种 "none", "xtls-rprx-vision"，客户端可以选择三种："none", "xtls-rprx-vision", "xtls-rprx-vision-udp443",但是选择了XTLS模式就是默认flow不为空或者"none",所以这里不再填加"none"这一项。
+        public static List<string> FlowList = new List<string> { "xtls-rprx-vision", "xtls-rprx-vision-udp443" };  //{ "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
+
+        public string UTLS { get; set; } = UTLSList[1];
+
+        public string Flow { get; set; } = FlowList[0];
+
         /// <summary>
         /// vless xtls shareLink
         /// </summary>

ProxySuper.Core/Models/Record.cs

@@ -51,6 +51,9 @@ namespace ProxySuper.Core.Models
         [JsonProperty("mtProtoGoSettings")]
         public MTProtoGoSettings MTProtoGoSettings { get; set; }
 
+        [JsonProperty]
+        public HysteriaSettings HysteriaSettings { get; set; }
+
 
         [JsonIgnore]
         public ProjectType Type
@@ -67,6 +70,8 @@ namespace ProxySuper.Core.Models
 
                 if (MTProtoGoSettings != null) return ProjectType.MTProtoGo;
 
+                if (HysteriaSettings != null) return ProjectType.Hysteria;
+
                 return ProjectType.Brook;
             }
         }

ProxySuper.Core/ProxySuper.Core.csproj

@@ -32,8 +32,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MvvmCross, Version=7.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmCross.7.1.2\lib\net461\MvvmCross.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross, Version=8.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmCross.8.0.2\lib\net461\MvvmCross.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -41,17 +44,31 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="QRCoder, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\QRCoder.1.4.1\lib\net40\QRCoder.dll</HintPath>
+    <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
+      <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2020.0.1.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2020.0.1\lib\net40\Renci.SshNet.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -73,6 +90,7 @@
     <Compile Include="Models\ProjectProgress.cs" />
     <Compile Include="Models\Projects\BrookSettings.cs" />
     <Compile Include="Models\Projects\BrookType.cs" />
+    <Compile Include="Models\Projects\HysteriaSettings.cs" />
     <Compile Include="Models\Projects\IProjectSettings.cs" />
     <Compile Include="Models\Hosts\LocalProxy.cs" />
     <Compile Include="Models\Projects\MTProtoGoSettings.cs" />
@@ -90,6 +108,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helpers\Utils.cs" />
     <Compile Include="Services\BrookService.cs" />
+    <Compile Include="Services\HysteriaService.cs" />
     <Compile Include="Services\MTProtoGoService.cs" />
     <Compile Include="Services\NaiveProxyService.cs" />
     <Compile Include="Services\ServiceBase.cs" />
@@ -105,6 +124,9 @@
     <Compile Include="ViewModels\BrookInstallViewModel.cs" />
     <Compile Include="ViewModels\EnableRootViewModel.cs" />
     <Compile Include="ViewModels\HomeViewModel.cs" />
+    <Compile Include="ViewModels\HysteriaConfigViewModel.cs" />
+    <Compile Include="ViewModels\HysteriaEditorViewModel.cs" />
+    <Compile Include="ViewModels\HysteriaInstallViewModel.cs" />
     <Compile Include="ViewModels\MTProtoGoConfigViewModel.cs" />
     <Compile Include="ViewModels\MTProtoGoEditorViewModel.cs" />
     <Compile Include="ViewModels\MTProtoGoInstallViewModel.cs" />
@@ -123,6 +145,7 @@
     <Compile Include="ViewModels\XrayInstallViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

ProxySuper.Core/Services/HysteriaService.cs

@@ -0,0 +1,172 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using ProxySuper.Core.Models.Hosts;
+using ProxySuper.Core.Models.Projects;
+using Renci.SshNet.Messages;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ProxySuper.Core.Services
+{
+    public class HysteriaService : ServiceBase<HysteriaSettings>
+    {
+        public HysteriaService(Host host, HysteriaSettings settings) : base(host, settings)
+        {
+        }
+
+
+        public void Install()
+        {
+            try
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    Progress.Step = "安装Hysteria";
+                    Progress.Percentage = 0;
+
+
+                    Progress.Desc = "检测系统环境";
+                    EnsureRootUser();
+                    EnsureSystemEnv();
+                    Progress.Percentage = 20;
+
+                    Progress.Desc = "安装必要的系统工具";
+                    InstallSystemTools();
+                    Progress.Percentage = 40;
+
+                    Progress.Desc = "配置防火墙";
+                    ConfigFirewalld();
+                    Progress.Percentage = 50;
+
+                    Progress.Step = "检测网络环境";
+                    EnsureNetwork();
+                    Progress.Percentage = 60;
+
+
+                    Progress.Desc = "检测域名是否绑定本机IP";
+                    ValidateDomain();
+                    Progress.Percentage = 80;
+
+                    Progress.Step = "上传Hysteria配置文件";
+                    UploadConfigFile();
+                    Progress.Step = "安装Hysteria服务";
+                    InstallHysteria();
+
+                    Progress.Percentage = 100;
+                    Progress.Step = "安装Hysteria成功";
+                    Progress.Desc = "安装Hysteria成功";
+                });
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+        public void Uninstall()
+        {
+            Task.Factory.StartNew(() =>
+            {
+                try
+                {
+                    Progress.Step = "卸载Hysteria";
+                    Progress.Percentage = 0;
+
+                    Progress.Desc = "停止Hysteria服务";
+                    RunCmd("systemctl stop Hysteria");
+                    RunCmd("systemctl disable Hysteria");
+                    Progress.Percentage = 30;
+
+                    Progress.Desc = "删除Hysteria相关文件";
+                    RunCmd("rm -rf /etc/systemd/system/Hysteria.service");
+                    RunCmd("rm -rf /usr/bin/Hysteria");
+                    Progress.Percentage = 80;
+
+                    Progress.Desc = "重置防火墙设置";
+                    ResetFirewalld();
+
+                    Progress.Percentage = 100;
+                    Progress.Desc = "卸载完成";
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                }
+            });
+        }
+
+        private string HysteriaServiceTemp = @"
+        [Unit]
+        Description=hysteria service
+        After=network.target syslog.target
+        Wants=network.target
+
+        [Service]
+        Type=simple
+        ExecStart=##run_cmd##
+
+        [Install]
+        WantedBy=multi-user.target";
+
+        private void InstallHysteria()
+        {
+            Progress.Desc = "执行Hysteria安装文件";
+            string url = "https://github.com/apernet/hysteria/releases/download/v1.3.4/hysteria-linux-386";
+            string targetPath = "/usr/bin/hysteria/hysteria-linux-386";
+
+            if (ArchType == ArchType.arm)
+            {
+                url = url.Replace("hysteria-linux-386", "hysteria-linux-arm");
+                targetPath = targetPath.Replace("hysteria-linux-386", "hysteria-linux-arm");
+            }
+
+            RunCmd($"curl -L {url} -o {targetPath}");
+            RunCmd($"chmod +x {targetPath}");
+
+            Progress.Desc = "设置Hysteria服务";
+            var cmd = targetPath + " -c /usr/bin/hysteria/config.json server";
+            var hysteriaService = HysteriaServiceTemp.Replace("##run_cmd##", cmd);
+
+            RunCmd("rm -rf /etc/systemd/system/hysteria.service");
+            RunCmd("touch /etc/systemd/system/hysteria.service");
+
+            RunCmd($"echo \"{hysteriaService}\" > /etc/systemd/system/hysteria.service");
+            RunCmd("sudo chmod 777 /etc/systemd/system/hysteria.service");
+
+
+            Progress.Desc = "启动Hysteria服务";
+            RunCmd("systemctl enable hysteria");
+            RunCmd("systemctl restart hysteria");
+        }
+
+        private const string ConfigFilePath = @"Templates\Hysteria\config.json";
+        private void UploadConfigFile()
+        {
+            var text = File.ReadAllText(ConfigFilePath, Encoding.UTF8);
+            var json = JsonConvert.DeserializeObject(text);
+            var obj = JToken.FromObject(json) as dynamic;
+
+
+            obj["listen"] = $":{Settings.Port}";
+            obj["acme"]["domains"][0] = Settings.Domain;
+            obj["email"] = Settings.Email;
+            obj["obfs"] = Settings.Obfs;
+
+            var configJson = JsonConvert.SerializeObject(
+              obj,
+              Formatting.Indented,
+              new JsonSerializerSettings()
+              {
+                  NullValueHandling = NullValueHandling.Ignore
+              });
+
+            RunCmd("mkdir /usr/bin/hysteria");
+            WriteToFile(configJson, "/usr/bin/hysteria/config.json");
+        }
+    }
+}

ProxySuper.Core/Services/MTProtoGoService.cs

@@ -42,7 +42,10 @@ namespace ProxySuper.Core.Services
                     Progress.Percentage = 50;
 
                     Progress.Step = "5. 生成密钥";
-                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg generate-secret {Settings.Cleartext}").TrimEnd('\n');
+                    //RunCmd("docker pull nineseconds/mtg:2");   //拉取v2版本命令，但是似乎不用也可以。
+                    //下面的命令是v1版本的命令格式。可以保留。将来如启用v1，可用。
+                    //Settings.SecretText = RunCmd($"docker run nineseconds/mtg:1 generate-secret -c {Settings.Cleartext} tls").TrimEnd('\n');
+                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg:2 generate-secret {Settings.Cleartext}").TrimEnd('\n');
                     Progress.Percentage = 65;
 
                     Progress.Step = "6. 生成配置文件";
@@ -55,7 +58,7 @@ namespace ProxySuper.Core.Services
                     Progress.Percentage = 80;
 
                     Progress.Step = "7. 启动MTProto服务";
-                    RunCmd($"docker run -d -v /etc/mtg.toml:/config.toml  --name=mtg --restart=always -p {Settings.Port + ":" + Settings.Port} nineseconds/mtg");
+                    RunCmd($"docker run -d -v /etc/mtg.toml:/config.toml  --name=mtg --restart=always -p {Settings.Port + ":" + Settings.Port} nineseconds/mtg:2");
                     Progress.Desc = "设置自启动MTProto服务";
 
                     Progress.Step = "安装完成";
@@ -116,7 +119,8 @@ namespace ProxySuper.Core.Services
                     Progress.Percentage = 50;
 
                     Progress.Desc = "生成密钥";
-                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg generate-secret {Settings.Cleartext}").TrimEnd('\n');
+                    //Settings.SecretText = RunCmd($"docker run nineseconds/mtg:1 generate-secret -c {Settings.Cleartext} tls").TrimEnd('\n'); //v1版本
+                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg:2 generate-secret {Settings.Cleartext}").TrimEnd('\n');
                     Progress.Percentage = 65;
 
                     Progress.Desc = "修改配置文件";

ProxySuper.Core/Services/ServiceBase.cs

@@ -198,7 +198,7 @@ namespace ProxySuper.Core.Services
                 Progress.Desc = ($"本机IP({IPv6})");
                 if (IPv6 != domainIP)
                 {
-                    throw new Exception("域名解析地址与服务器IP不匹配！");
+                    //throw new Exception("域名解析地址与服务器IP不匹配！");
                 }
             }
             else
@@ -207,7 +207,7 @@ namespace ProxySuper.Core.Services
                 Progress.Desc = ($"域名IP({domainIP})");
                 if (IPv4 != domainIP)
                 {
-                    throw new Exception("域名解析地址与服务器IP不匹配！");
+                    //throw new Exception("域名解析地址与服务器IP不匹配！");
                 }
             }
         }
@@ -412,7 +412,7 @@ namespace ProxySuper.Core.Services
             string cmd;
 
             Progress.Desc = ("检测IPv4");
-            cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv4 --max-time 8");
+            cmd = RunCmd(@"curl -4 ip.sb");
             IPv4 = cmd.TrimEnd('\r', '\n');
 
             Progress.Desc = ($"IPv4地址为{IPv4}");
@@ -423,7 +423,7 @@ namespace ProxySuper.Core.Services
             else
             {
                 Progress.Desc = ("检测IPv6");
-                cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv6 --max-time 8");
+                cmd = RunCmd(@"curl -6 ip.sb");
                 IPv6 = cmd.TrimEnd('\r', '\n');
                 Progress.Desc = ($"IPv6地址为{IPv6}");
 
@@ -802,13 +802,13 @@ namespace ProxySuper.Core.Services
                 if (_host.SecretType == LoginSecretType.PrivateKey)
                 {
                     PrivateKeyFile keyFile;
-                    if (string.IsNullOrEmpty(_host.Password))
+                    if (string.IsNullOrEmpty(_host.PrivateKeyPassPhrase))
                     {
                         keyFile = new PrivateKeyFile(_host.PrivateKeyPath);
                     }
                     else
                     {
-                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.Password);
+                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.PrivateKeyPassPhrase);
                     }
                     authMethods.Add(new PrivateKeyAuthenticationMethod(_host.UserName, keyFile));
                 }

ProxySuper.Core/Services/ShareLink.cs

@@ -78,12 +78,14 @@ namespace ProxySuper.Core.Services
                 case RayType.VLESS_TCP_XTLS:
                 case RayType.VLESS_WS:
                 case RayType.VLESS_KCP:
+                case RayType.VLESS_QUIC:
                 case RayType.VLESS_gRPC:
                 case RayType.Trojan_TCP:
                     return BuildVlessShareLink(xrayType, settings);
                 case RayType.VMESS_TCP:
                 case RayType.VMESS_WS:
                 case RayType.VMESS_KCP:
+                case RayType.VMESS_QUIC:
                     return BuildVmessShareLink(xrayType, settings);
                 case RayType.ShadowsocksAEAD:
                     return BuildShadowSocksShareLink(settings);
@@ -142,6 +144,15 @@ namespace ProxySuper.Core.Services
                     vmess.path = settings.VMESS_KCP_Seed;
                     vmess.tls = "";
                     break;
+                case RayType.VMESS_QUIC:
+                    vmess.ps = "vmess-quic";
+                    vmess.port = settings.VMESS_QUIC_Port.ToString();
+                    vmess.net = "quic";
+                    vmess.type = settings.VMESS_QUIC_Type;
+                    vmess.path = settings.VMESS_QUIC_Key;
+                    vmess.host = settings.VMESS_QUIC_Security;
+                    vmess.tls = "tls";
+                    break;
                 default:
                     return string.Empty;
             }
@@ -162,8 +173,6 @@ namespace ProxySuper.Core.Services
             var _path = "/";
             var _host = settings.Domain;
             var _descriptiveText = string.Empty;
-            var _headerType = "none";
-            var _seed = string.Empty;
 
             switch (xrayType)
             {
@@ -175,7 +184,7 @@ namespace ProxySuper.Core.Services
                 case RayType.VLESS_TCP_XTLS:
                     _protocol = "vless";
                     _type = "tcp";
-                    _security = "xtls";
+                    _security = "tls";
                     _descriptiveText = "vless-tcp-xtls";
                     break;
                 case RayType.VLESS_WS:
@@ -187,12 +196,17 @@ namespace ProxySuper.Core.Services
                 case RayType.VLESS_KCP:
                     _protocol = "vless";
                     _type = "kcp";
-                    _headerType = settings.VLESS_KCP_Type;
-                    _seed = settings.VLESS_KCP_Seed;
                     _port = settings.VLESS_KCP_Port;
                     _security = "none";
                     _descriptiveText = "vless-mKCP";
                     break;
+                case RayType.VLESS_QUIC:
+                    _protocol = "vless";
+                    _port = settings.VLESS_QUIC_Port;
+                    _type = "quic";
+                    _security = "tls";
+                    _descriptiveText = "vless-quic";
+                    break;
                 case RayType.VLESS_gRPC:
                     _protocol = "vless";
                     _type = "grpc";
@@ -213,18 +227,32 @@ namespace ProxySuper.Core.Services
             if (xrayType != RayType.Trojan_TCP)
             {
                 // 4.3 传输层相关段
-                parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&path={HttpUtility.UrlEncode(_path)}&headerType={_headerType}";
+                parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&path={HttpUtility.UrlEncode(_path)}";
 
                 // kcp
                 if (xrayType == RayType.VLESS_KCP)
                 {
-                    parametersURL += $"&seed={_seed}";
+                    parametersURL += $"&seed={settings.VLESS_KCP_Seed}&headerType={settings.VLESS_KCP_Type}";
+                }
+
+                if (xrayType == RayType.VLESS_QUIC)
+                {
+                    parametersURL += $"&quicSecurity={settings.VLESS_QUIC_Security}";
+                    if (settings.VLESS_QUIC_Security != "none")
+                    {
+                        parametersURL += $"&key={HttpUtility.UrlEncode(settings.VLESS_QUIC_Key)}";
+                    }
+                    parametersURL += $"&headerType={settings.VLESS_QUIC_Type}";
                 }
 
                 // 4.4 TLS 相关段
-                if (xrayType == RayType.VLESS_TCP_XTLS)
+                if (settings is XraySettings)
                 {
-                    parametersURL += "&flow=xtls-rprx-direct";
+                    if (xrayType == RayType.VLESS_TCP_XTLS)
+                    {
+                        var xraySettings = settings as XraySettings;
+                        parametersURL += $"&flow={xraySettings.Flow}";
+                    }
                 }
 
 

ProxySuper.Core/Services/V2rayConfigBuilder.cs

@@ -110,8 +110,9 @@ namespace ProxySuper.Core.Services
 
         public static string BuildV2rayConfig(V2raySettings parameters)
         {
-            var uuidList = parameters.MulitUUID;
-            uuidList.Insert(0, parameters.UUID);
+            var uuidList = new List<string>();
+            uuidList.Add(parameters.UUID);
+            uuidList.AddRange(parameters.MulitUUID);
 
             var xrayConfig = LoadV2rayConfig();
 
@@ -186,6 +187,7 @@ namespace ProxySuper.Core.Services
             }
             #endregion
 
+            #region VLESS GRPC
             if (parameters.Types.Contains(RayType.VLESS_gRPC))
             {
                 var gRPCInBound = GetBound("VLESS_gRPC.json");
@@ -195,7 +197,9 @@ namespace ProxySuper.Core.Services
                 gRPCInBound.streamSettings.tlsSettings.serverName = parameters.Domain;
                 xrayConfig.inbounds.Add(JToken.FromObject(gRPCInBound));
             }
+            #endregion
 
+            #region VLESS KCP
             if (parameters.Types.Contains(RayType.VLESS_KCP))
             {
                 var kcpBound = GetBound("VLESS_KCP.json");
@@ -205,7 +209,22 @@ namespace ProxySuper.Core.Services
                 kcpBound.streamSettings.kcpSettings.seed = parameters.VLESS_KCP_Seed;
                 xrayConfig.inbounds.Add(JToken.FromObject(kcpBound));
             }
+            #endregion
 
+            #region VLESS QUIC
+            if (parameters.Types.Contains(RayType.VLESS_QUIC))
+            {
+                var quicBound = GetBound("VLESS_QUIC.json");
+                quicBound.port = parameters.VLESS_QUIC_Port;
+                SetClients(quicBound, uuidList);
+                quicBound.streamSettings.quicSettings.security = parameters.VLESS_QUIC_Security;
+                quicBound.streamSettings.quicSettings.key = parameters.VLESS_QUIC_Key;
+                quicBound.streamSettings.quicSettings.header.type = parameters.VLESS_QUIC_Type;
+                xrayConfig.inbounds.Add(JToken.FromObject(quicBound));
+            }
+            #endregion
+
+            #region VMESS KCP
             if (parameters.Types.Contains(RayType.VMESS_KCP))
             {
                 var kcpBound = GetBound("VMESS_KCP.json");
@@ -215,7 +234,22 @@ namespace ProxySuper.Core.Services
                 kcpBound.streamSettings.kcpSettings.seed = parameters.VMESS_KCP_Seed;
                 xrayConfig.inbounds.Add(JToken.FromObject(kcpBound));
             }
+            #endregion
 
+            #region VMESS QUIC
+            if (parameters.Types.Contains(RayType.VMESS_QUIC))
+            {
+                var quicBound = GetBound("VMESS_QUIC.json");
+                quicBound.port = parameters.VMESS_QUIC_Port;
+                SetClients(quicBound, uuidList);
+                quicBound.streamSettings.quicSettings.security = parameters.VMESS_QUIC_Security;
+                quicBound.streamSettings.quicSettings.key = parameters.VMESS_QUIC_Key;
+                quicBound.streamSettings.quicSettings.header.type = parameters.VMESS_QUIC_Type;
+                xrayConfig.inbounds.Add(JToken.FromObject(quicBound));
+            }
+            #endregion
+
+            #region Shadowsocks
             if (parameters.Types.Contains(RayType.ShadowsocksAEAD))
             {
                 var ssBound = GetBound("Shadowsocks-AEAD.json");
@@ -224,6 +258,7 @@ namespace ProxySuper.Core.Services
                 ssBound.settings.method = parameters.ShadowSocksMethod;
                 xrayConfig.inbounds.Add(JToken.FromObject(ssBound));
             }
+            #endregion
 
             return JsonConvert.SerializeObject(
                 xrayConfig,

ProxySuper.Core/Services/XrayConfigBuilder.cs

@@ -79,7 +79,8 @@ namespace ProxySuper.Core.Services
                 }
                 var domain = parameters.MaskDomain
                     .TrimStart("http://".ToCharArray())
-                    .TrimStart("https://".ToCharArray());
+                    .TrimStart("https://".ToCharArray())
+                    .TrimEnd('/');
 
                 caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n        header_up Host {domain} \n    }}");
             }
@@ -91,7 +92,7 @@ namespace ProxySuper.Core.Services
             return caddyStr;
         }
 
-        private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false)
+        private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false, string flow = "")
         {
             bound.settings.clients.Clear();
             uuidList.ForEach(id =>
@@ -103,18 +104,19 @@ namespace ProxySuper.Core.Services
                 }
                 else
                 {
-                    obj = new { id = id, flow = "xtls-rprx-direct" };
+                    flow = "xtls-rprx-vision";//兼容普通tls与xtls
+                    obj = new { id = id, flow = flow };
                 }
 
                 bound.settings.clients.Add(JToken.FromObject(obj));
             });
         }
 
-
         public static string BuildXrayConfig(XraySettings parameters)
         {
-            var uuidList = parameters.MulitUUID;
-            uuidList.Insert(0, parameters.UUID);
+            var uuidList = new List<string>();
+            uuidList.Add(parameters.UUID);
+            uuidList.AddRange(parameters.MulitUUID);
 
             var xrayConfig = LoadXrayConfig();
 
@@ -125,7 +127,7 @@ namespace ProxySuper.Core.Services
                 dest = FullbackPort
             }));
             xrayConfig.inbounds.Add(baseBound);
-            SetClients(baseBound, uuidList, withXtls: true);
+            SetClients(baseBound, uuidList, withXtls: true, flow: parameters.Flow);
 
             #region Fullbacks
 
@@ -189,6 +191,7 @@ namespace ProxySuper.Core.Services
             }
             #endregion
 
+            #region VLESS GRPC
             if (parameters.Types.Contains(RayType.VLESS_gRPC))
             {
                 var gRPCInBound = GetBound("VLESS_gRPC.json");
@@ -198,7 +201,9 @@ namespace ProxySuper.Core.Services
                 gRPCInBound.streamSettings.tlsSettings.serverName = parameters.Domain;
                 xrayConfig.inbounds.Add(JToken.FromObject(gRPCInBound));
             }
+            #endregion
 
+            #region VLESS KCP
             if (parameters.Types.Contains(RayType.VLESS_KCP))
             {
                 var kcpBound = GetBound("VLESS_KCP.json");
@@ -208,7 +213,22 @@ namespace ProxySuper.Core.Services
                 kcpBound.streamSettings.kcpSettings.seed = parameters.VLESS_KCP_Seed;
                 xrayConfig.inbounds.Add(JToken.FromObject(kcpBound));
             }
+            #endregion
 
+            #region VLESS QUIC
+            if (parameters.Types.Contains(RayType.VLESS_QUIC))
+            {
+                var quicBound = GetBound("VLESS_QUIC.json");
+                quicBound.port = parameters.VLESS_QUIC_Port;
+                SetClients(quicBound, uuidList);
+                quicBound.streamSettings.quicSettings.security = parameters.VLESS_QUIC_Security;
+                quicBound.streamSettings.quicSettings.key = parameters.VLESS_QUIC_Key;
+                quicBound.streamSettings.quicSettings.header.type = parameters.VLESS_QUIC_Type;
+                xrayConfig.inbounds.Add(JToken.FromObject(quicBound));
+            }
+            #endregion
+
+            #region VMESS KCP
             if (parameters.Types.Contains(RayType.VMESS_KCP))
             {
                 var kcpBound = GetBound("VMESS_KCP.json");
@@ -218,7 +238,22 @@ namespace ProxySuper.Core.Services
                 kcpBound.streamSettings.kcpSettings.seed = parameters.VMESS_KCP_Seed;
                 xrayConfig.inbounds.Add(JToken.FromObject(kcpBound));
             }
+            #endregion
 
+            #region VMESS QUIC
+            if (parameters.Types.Contains(RayType.VMESS_QUIC))
+            {
+                var quicBound = GetBound("VMESS_QUIC.json");
+                quicBound.port = parameters.VMESS_QUIC_Port;
+                SetClients(quicBound, uuidList);
+                quicBound.streamSettings.quicSettings.security = parameters.VMESS_QUIC_Security;
+                quicBound.streamSettings.quicSettings.key = parameters.VMESS_QUIC_Key;
+                quicBound.streamSettings.quicSettings.header.type = parameters.VMESS_QUIC_Type;
+                xrayConfig.inbounds.Add(JToken.FromObject(quicBound));
+            }
+            #endregion
+
+            #region Shadowsocks
             if (parameters.Types.Contains(RayType.ShadowsocksAEAD))
             {
                 var ssBound = GetBound("Shadowsocks-AEAD.json");
@@ -227,6 +262,7 @@ namespace ProxySuper.Core.Services
                 ssBound.settings.method = parameters.ShadowSocksMethod;
                 xrayConfig.inbounds.Add(JToken.FromObject(ssBound));
             }
+            #endregion
 
             return JsonConvert.SerializeObject(
                 xrayConfig,

ProxySuper.Core/ViewModels/HomeViewModel.cs

@@ -53,6 +53,10 @@ namespace ProxySuper.Core.ViewModels
             {
                 ContractResolver = new CamelCasePropertyNamesContractResolver()
             });
+            if (!Directory.Exists("Data"))
+            {
+                Directory.CreateDirectory("Data");
+            }
             File.WriteAllText("Data/Record.json", json);
         }
 
@@ -104,6 +108,8 @@ namespace ProxySuper.Core.ViewModels
 
         public IMvxCommand AddBrookCommand => new MvxAsyncCommand(AddBrookRecord);
 
+        public IMvxCommand AddHysteriaCommand => new MvxAsyncCommand(AddHysteriaRecord);
+
         public IMvxCommand RemoveCommand => new MvxAsyncCommand<string>(DeleteRecord);
 
         public IMvxCommand EditCommand => new MvxAsyncCommand<string>(EditRecord);
@@ -200,6 +206,21 @@ namespace ProxySuper.Core.ViewModels
             SaveToJson();
         }
 
+        public async Task AddHysteriaRecord()
+        {
+            Record record = new Record();
+            record.Id = Utils.GetTickID();
+            record.Host = new Host();
+            record.HysteriaSettings = new HysteriaSettings();
+
+            var result = await _navigationService.Navigate<HysteriaEditorViewModel, Record, Record>(record);
+            if (result == null) return;
+
+            Records.Add(result);
+
+            SaveToJson();
+        }
+
 
         public async Task EditRecord(string id)
         {
@@ -255,6 +276,14 @@ namespace ProxySuper.Core.ViewModels
                 record.Host = result.Host;
                 record.MTProtoGoSettings = result.MTProtoGoSettings;
             }
+            if (record.Type == ProjectType.Hysteria)
+            {
+                result = await _navigationService.Navigate<HysteriaEditorViewModel, Record, Record>(record);
+                if (result == null) return;
+
+                record.Host = result.Host;
+                record.HysteriaSettings = result.HysteriaSettings;
+            }
 
             SaveToJson();
         }
@@ -303,6 +332,10 @@ namespace ProxySuper.Core.ViewModels
             {
                 await _navigationService.Navigate<MTProtoGoConfigViewModel, MTProtoGoSettings>(record.MTProtoGoSettings);
             }
+            if (record.Type == ProjectType.Hysteria)
+            {
+                await _navigationService.Navigate<HysteriaConfigViewModel, HysteriaSettings>(record.HysteriaSettings);
+            }
         }
 
         public async Task GoToInstall(string id)
@@ -335,6 +368,10 @@ namespace ProxySuper.Core.ViewModels
             {
                 await _navigationService.Navigate<MTProtoGoInstallViewModel, Record>(record);
             }
+            if (record.Type == ProjectType.Hysteria)
+            {
+                await _navigationService.Navigate<HysteriaInstallViewModel, Record>(record);
+            }
 
             SaveToJson();
         }

ProxySuper.Core/ViewModels/HysteriaConfigViewModel.cs

@@ -0,0 +1,45 @@
+using MvvmCross.ViewModels;
+using Newtonsoft.Json;
+using ProxySuper.Core.Models.Projects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProxySuper.Core.ViewModels
+{
+    public class HysteriaConfigViewModel : MvxViewModel<HysteriaSettings>
+    {
+        public HysteriaSettings Settings { get; set; }
+
+        public override void Prepare(HysteriaSettings parameter)
+        {
+            Settings = parameter;
+        }
+
+        public string ClientJson { 
+        
+            get
+            {
+                var jsonData = new  
+                {
+                    server = $"{Settings.Domain}:{Settings.Port}",
+                    obfs = Settings.Obfs,
+                    up_mbps = 10,
+                    down_mbps = 50,
+                    socks5 = new
+                    {
+                        listen = "127.0.0.1:1080"
+                    },
+                    http = new
+                    {
+                        listen = "127.0.0.1:1081"
+                    }
+                };
+
+                return JsonConvert.SerializeObject(jsonData, Formatting.Indented);
+            }
+        }
+    }
+}

ProxySuper.Core/ViewModels/HysteriaEditorViewModel.cs

@@ -0,0 +1,68 @@
+using MvvmCross.Commands;
+using MvvmCross.Navigation;
+using MvvmCross.ViewModels;
+using ProxySuper.Core.Models;
+using ProxySuper.Core.Models.Hosts;
+using ProxySuper.Core.Models.Projects;
+using ProxySuper.Core.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Navigation;
+
+namespace ProxySuper.Core.ViewModels
+{
+    public class HysteriaEditorViewModel : MvxViewModel<Record, Record>
+    {
+        public string Id { get; set; }
+
+        public Host Host { get; set; }
+
+        public HysteriaSettings Settings { get; set; }
+
+        public IMvxNavigationService NavigationService { get; }
+
+        public IMvxCommand SaveCommand => new MvxCommand(() => Save());
+
+        public IMvxCommand SaveAndInstallCommand => new MvxCommand(SaveAndInstall);
+
+        public HysteriaEditorViewModel(IMvxNavigationService mvxNavigationService)
+        {
+            NavigationService = mvxNavigationService;
+        }
+
+        public override void Prepare(Record parameter)
+        {
+            var record = Utils.DeepClone(parameter);
+
+            Id = record.Id;
+            Host = record.Host;
+            Settings = record.HysteriaSettings;
+        }
+
+        public void Save()
+        {
+            NavigationService.Close(this, new Record
+            {
+                Id = Id,
+                Host = Host,
+                HysteriaSettings = Settings,
+            });
+        }
+
+        public void SaveAndInstall()
+        {
+            var record = new Record
+            {
+                Id = Id,
+                Host = Host,
+                HysteriaSettings = Settings,
+            };
+
+            NavigationService.Close(this, record);
+            NavigationService.Navigate<HysteriaInstallViewModel, Record>(record);
+        }
+    }
+}

ProxySuper.Core/ViewModels/HysteriaInstallViewModel.cs

@@ -0,0 +1,66 @@
+using MvvmCross.Commands;
+using MvvmCross.ViewModels;
+using ProxySuper.Core.Models;
+using ProxySuper.Core.Models.Hosts;
+using ProxySuper.Core.Models.Projects;
+using ProxySuper.Core.Services;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProxySuper.Core.ViewModels
+{
+    public class HysteriaInstallViewModel : MvxViewModel<Record>
+    {
+        public Host _host { get; set; }
+
+        public HysteriaSettings _settings { get; set; }
+
+        public HysteriaService _service { get; set; }
+
+        public override void Prepare(Record parameter)
+        {
+            _host = parameter.Host;
+            _settings = parameter.HysteriaSettings;
+        }
+
+        public override Task Initialize()
+        {
+            _service = new HysteriaService(_host, _settings);
+            _service.Progress.StepUpdate = () => RaisePropertyChanged("Progress");
+            _service.Progress.LogsUpdate = () => RaisePropertyChanged("Logs");
+            _service.Connect();
+            return base.Initialize();
+        }
+
+        public override void ViewDestroy(bool viewFinishing = true)
+        {
+            _service.Disconnect();
+            this.SaveInstallLog();
+            base.ViewDestroy(viewFinishing);
+        }
+
+        public ProjectProgress Progress => _service.Progress;
+
+        public string Logs => _service.Progress.Logs;
+
+        public IMvxCommand InstallCommand => new MvxCommand(_service.Install);
+
+        public IMvxCommand UninstallCommand => new MvxCommand(_service.Uninstall);
+
+
+        private void SaveInstallLog()
+        {
+            if (!Directory.Exists("Logs"))
+            {
+                Directory.CreateDirectory("Logs");
+            }
+
+            var fileName = System.IO.Path.Combine("Logs", DateTime.Now.ToString("yyyy-MM-dd hh-mm") + ".hysteria.txt");
+            File.WriteAllText(fileName, Logs);
+        }
+    }
+}

ProxySuper.Core/ViewModels/V2rayConfigViewModel.cs

@@ -42,6 +42,14 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public bool Checked_VLESS_QUIC
+        {
+            get
+            {
+                return Settings.Types.Contains(RayType.VLESS_QUIC);
+            }
+        }
+
         public bool Checked_VLESS_gRPC
         {
             get
@@ -74,6 +82,14 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public bool Checked_VMESS_QUIC
+        {
+            get
+            {
+                return Settings.Types.Contains(RayType.VMESS_QUIC);
+            }
+        }
+
         public bool Checked_Trojan_TCP
         {
             get

ProxySuper.Core/ViewModels/V2rayEditorViewModel.cs

@@ -64,12 +64,34 @@ namespace ProxySuper.Core.ViewModels
         }
     }
 
-
-
-
-
     public partial class V2rayEditorViewModel
     {
+        public List<string> KcpTypes => V2raySettings.DisguiseTypes;
+
+        public List<string> QuicTypes => V2raySettings.DisguiseTypes;
+
+        /// <summary>
+        /// https://www.v2ray.com/chapter_02/transport/quic.html
+        /// </summary>
+        public List<string> QuicSecurities => new List<string> {
+            "none",
+            "aes-128-gcm",
+            "chacha20-poly1305"
+        };
+
+        /// <summary>
+        /// https://www.v2ray.com/chapter_02/protocols/shadowsocks.html
+        /// </summary>
+        public List<string> ShadowSocksMethods => new List<string> {
+            "aes-256-cfb",
+            "aes-128-cfb",
+            "chacha20",
+            "chacha20-ietf",
+            "aes-256-gcm",
+            "aes-128-gcm",
+            "chacha20-poly1305"
+        };
+
         public IMvxCommand RandomUuid => new MvxCommand(() => GetUuid());
 
         public bool WithTLS
@@ -112,17 +134,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        public int ShadowSocksPort
-        {
-            get => Settings.ShadowSocksPort;
-            set
-            {
-                Settings.ShadowSocksPort = value;
-                RaisePropertyChanged("ShadowSocksPort");
-            }
-        }
-
-
         public string UUID
         {
             get => Settings.UUID;
@@ -139,7 +150,8 @@ namespace ProxySuper.Core.ViewModels
             set
             {
                 var input = value.Replace('，', ',');
-                var arr = input.Split(',').ToList();
+                var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+                arr.RemoveAll(x => x == this.UUID);
                 Settings.MulitUUID = arr;
                 RaisePropertyChanged("MultiUUID");
             }
@@ -165,12 +177,12 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        #region Torjan
         public string TrojanPassword
         {
             get => Settings.TrojanPassword;
             set => Settings.TrojanPassword = value;
         }
-
         public bool Checked_Trojan_TCP
         {
             get
@@ -195,9 +207,18 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.Trojan_TCP, Settings);
         }
+        #endregion
 
-        private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
-        public List<string> ShadowSocksMethods => _ssMethods;
+        #region ShadowSocks
+        public int ShadowSocksPort
+        {
+            get => Settings.ShadowSocksPort;
+            set
+            {
+                Settings.ShadowSocksPort = value;
+                RaisePropertyChanged("ShadowSocksPort");
+            }
+        }
         public bool CheckedShadowSocks
         {
 
@@ -208,6 +229,7 @@ namespace ProxySuper.Core.ViewModels
                 RaisePropertyChanged("CheckedShadowSocks");
             }
         }
+
         public string ShadowSocksPassword
         {
             get => Settings.ShadowSocksPassword;
@@ -229,6 +251,7 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
         }
+        #endregion
 
 
         private void CheckBoxChanged(bool value, RayType type)
@@ -257,11 +280,11 @@ namespace ProxySuper.Core.ViewModels
     }
 
     /// <summary>
-    /// VMESS
+    /// VMESS SETTINGS
     /// </summary>
     public partial class V2rayEditorViewModel
     {
-        // vmess tcp
+        #region VMESS TCP
         public bool Checked_VMESS_TCP
         {
             get => Settings.Types.Contains(RayType.VMESS_TCP);
@@ -280,8 +303,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_TCP, Settings);
         }
+        #endregion
 
-        // vmess ws
+        #region VMESS WS
         public bool Checked_VMESS_WS
         {
             get => Settings.Types.Contains(RayType.VMESS_WS);
@@ -300,8 +324,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_WS, Settings);
         }
+        #endregion
 
-        // vmess kcp
+        #region VMESS KCP
         public string VMESS_KCP_Seed
         {
             get => Settings.VMESS_KCP_Seed;
@@ -332,18 +357,69 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_KCP, Settings);
         }
+        #endregion
 
+        #region VMESS QUIC
+        public bool Checked_VMESS_QUIC
+        {
+            get => Settings.Types.Contains(RayType.VMESS_QUIC);
+            set
+            {
+                CheckBoxChanged(value, RayType.VMESS_QUIC);
+                RaisePropertyChanged(nameof(Checked_VMESS_QUIC));
+            }
+        }
+        public string VMESS_QUIC_Key
+        {
+            get => Settings.VMESS_QUIC_Key;
+            set
+            {
+                Settings.VMESS_QUIC_Key = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Key));
+            }
+        }
+        public string VMESS_QUIC_Security
+        {
+            get => Settings.VMESS_QUIC_Security;
+            set
+            {
+                Settings.VMESS_QUIC_Security = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Security));
+            }
+        }
+        public string VMESS_QUIC_Type
+        {
+            get => Settings.VMESS_QUIC_Type;
+            set
+            {
+                Settings.VMESS_QUIC_Type = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Type));
+            }
+        }
+        public int VMESS_QUIC_Port
+        {
+            get => Settings.VMESS_QUIC_Port;
+            set
+            {
+                Settings.VMESS_QUIC_Port = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Port));
+            }
+        }
+        public string VMESS_QUIC_ShareLink
+        {
+            get => ShareLink.Build(RayType.VMESS_QUIC, Settings);
+        }
+        #endregion
 
-        private List<string> _kcpTypes = new List<string> { "none", "srtp", "utp", "wechat-video", "dtls", "wireguard", };
-        public List<string> KcpTypes => _kcpTypes;
     }
 
+
     /// <summary>
-    /// VLESS
+    /// VLESS SETTINGS
     /// </summary>
     public partial class V2rayEditorViewModel
     {
-        // vless tcp
+        #region VLESS TCP
         public bool Checked_VLESS_TCP
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP);
@@ -357,9 +433,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP, Settings);
         }
+        #endregion
 
-
-        // vless ws
+        #region VLESS WS
         public string VLESS_WS_Path
         {
             get => Settings.VLESS_WS_Path;
@@ -381,8 +457,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_WS, Settings);
         }
+        #endregion
 
-        // vless kcp
+        #region VLESS KCP
         public string VLESS_KCP_Seed
         {
             get => Settings.VLESS_KCP_Seed;
@@ -413,8 +490,60 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_KCP, Settings);
         }
+        #endregion
 
-        // vless grpc
+        #region VLESS QUIC
+        public bool Checked_VLESS_QUIC
+        {
+            get => Settings.Types.Contains(RayType.VLESS_QUIC);
+            set
+            {
+                CheckBoxChanged(value, RayType.VLESS_QUIC);
+                RaisePropertyChanged(nameof(Checked_VLESS_QUIC));
+            }
+        }
+        public string VLESS_QUIC_Key
+        {
+            get => Settings.VLESS_QUIC_Key; set
+            {
+                Settings.VLESS_QUIC_Key = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Key));
+            }
+        }
+        public string VLESS_QUIC_Security
+        {
+            get => Settings.VLESS_QUIC_Security;
+            set
+            {
+                Settings.VLESS_QUIC_Security = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Security));
+            }
+        }
+        public string VLESS_QUIC_Type
+        {
+            get => Settings.VLESS_QUIC_Type;
+            set
+            {
+                Settings.VLESS_QUIC_Type = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Type));
+            }
+        }
+        public int VLESS_QUIC_Port
+        {
+            get => Settings.VLESS_QUIC_Port;
+            set
+            {
+                Settings.VLESS_QUIC_Port = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Port));
+            }
+        }
+        public string VLESS_QUIC_ShareLink
+        {
+            get => ShareLink.Build(RayType.VLESS_QUIC, Settings);
+        }
+        #endregion
+
+        #region VLESS gRPC
         public string VLESS_gRPC_ServiceName
         {
             get => Settings.VLESS_gRPC_ServiceName;
@@ -438,5 +567,6 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
         }
+        #endregion
     }
 }

ProxySuper.Core/ViewModels/XrayConfigViewModel.cs

@@ -13,6 +13,16 @@ namespace ProxySuper.Core.ViewModels
             Settings = parameter;
         }
 
+        public string Flow
+        {
+            get { return Settings.Flow; }
+        }
+
+        public string UTLS
+        {
+            get { return Settings.UTLS; }
+        }
+
         public bool Checked_VLESS_TCP_XTLS
         {
             get
@@ -45,6 +55,14 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public bool Checked_VLESS_QUIC
+        {
+            get
+            {
+                return Settings.Types.Contains(RayType.VLESS_QUIC);
+            }
+        }
+
         public bool Checked_VLESS_gRPC
         {
             get
@@ -77,6 +95,14 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public bool Checked_VMESS_QUIC
+        {
+            get
+            {
+                return Settings.Types.Contains(RayType.VMESS_QUIC);
+            }
+        }
+
         public bool Checked_Trojan_TCP
         {
             get

ProxySuper.Core/ViewModels/XrayEditorViewModel.cs

@@ -65,6 +65,30 @@ namespace ProxySuper.Core.ViewModels
 
     public partial class XrayEditorViewModel
     {
+        public List<string> UTLSList { get => XraySettings.UTLSList; }
+
+        public List<string> KcpTypes => V2raySettings.DisguiseTypes;
+
+        public List<string> QuicTypes => V2raySettings.DisguiseTypes;
+
+        public List<string> QuicSecurities => new List<string>
+        {
+            "none",
+            "aes-128-gcm",
+            "chacha20-poly1305"
+        };
+
+        public List<string> ShadowSocksMethods => new List<string>
+        {
+            "2022-blake3-aes-128-gcm",
+            "2022-blake3-aes-256-gcm",
+            "2022-blake3-chacha20-poly1305",
+            "aes-256-gcm",
+            "aes-128-gcm",
+            "chacha20-poly1305",
+            "none"
+        };
+
         public IMvxCommand RandomUuid => new MvxCommand(() => GetUuid());
 
         public bool WithTLS
@@ -87,6 +111,17 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+
+        public string UTLS
+        {
+            get => Settings.UTLS;
+            set
+            {
+                Settings.UTLS = value;
+                RaisePropertyChanged(nameof(UTLS));
+            }
+        }
+
         public int VLESS_KCP_Port
         {
             get => Settings.VLESS_KCP_Port;
@@ -107,17 +142,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        public int ShadowSocksPort
-        {
-            get => Settings.ShadowSocksPort;
-            set
-            {
-                Settings.ShadowSocksPort = value;
-                RaisePropertyChanged("ShadowSocksPort");
-            }
-        }
-
-
         public string UUID
         {
             get => Settings.UUID;
@@ -134,7 +158,8 @@ namespace ProxySuper.Core.ViewModels
             set
             {
                 var input = value.Replace('，', ',');
-                var arr = input.Split(',').ToList();
+                var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+                arr.RemoveAll(x => x == this.UUID);
                 Settings.MulitUUID = arr;
                 RaisePropertyChanged("MultiUUID");
             }
@@ -160,6 +185,7 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        #region Trojan
         public string TrojanPassword
         {
             get => Settings.TrojanPassword;
@@ -190,9 +216,18 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.Trojan_TCP, Settings);
         }
+        #endregion
 
-        private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
-        public List<string> ShadowSocksMethods => _ssMethods;
+        #region ShadowSocks
+        public int ShadowSocksPort
+        {
+            get => Settings.ShadowSocksPort;
+            set
+            {
+                Settings.ShadowSocksPort = value;
+                RaisePropertyChanged("ShadowSocksPort");
+            }
+        }
         public bool CheckedShadowSocks
         {
 
@@ -224,7 +259,7 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
         }
-
+        #endregion
 
         private void CheckBoxChanged(bool value, RayType type)
         {
@@ -241,8 +276,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-
-
         private void GetUuid()
         {
             UUID = Guid.NewGuid().ToString();
@@ -256,7 +289,7 @@ namespace ProxySuper.Core.ViewModels
     /// </summary>
     public partial class XrayEditorViewModel
     {
-        // vmess tcp
+        #region VMESS TCP
         public bool Checked_VMESS_TCP
         {
             get => Settings.Types.Contains(RayType.VMESS_TCP);
@@ -275,8 +308,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_TCP, Settings);
         }
+        #endregion
 
-        // vmess ws
+        #region VMESS WS
         public bool Checked_VMESS_WS
         {
             get => Settings.Types.Contains(RayType.VMESS_WS);
@@ -295,8 +329,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_WS, Settings);
         }
+        #endregion
 
-        // vmess kcp
+        #region VMESS KCP
         public string VMESS_KCP_Seed
         {
             get => Settings.VMESS_KCP_Seed;
@@ -327,10 +362,60 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_KCP, Settings);
         }
+        #endregion
 
+        #region VMESS QUIC
+        public bool Checked_VMESS_QUIC
+        {
+            get => Settings.Types.Contains(RayType.VMESS_QUIC);
+            set
+            {
+                CheckBoxChanged(value, RayType.VMESS_QUIC);
+                RaisePropertyChanged(nameof(Checked_VMESS_QUIC));
+            }
+        }
+        public string VMESS_QUIC_Key
+        {
+            get => Settings.VMESS_QUIC_Key;
+            set
+            {
+                Settings.VMESS_QUIC_Key = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Key));
+            }
+        }
+        public string VMESS_QUIC_Security
+        {
+            get => Settings.VMESS_QUIC_Security;
+            set
+            {
+                Settings.VMESS_QUIC_Security = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Security));
+            }
+        }
+        public string VMESS_QUIC_Type
+        {
+            get => Settings.VMESS_QUIC_Type;
+            set
+            {
+                Settings.VMESS_QUIC_Type = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Type));
+            }
+        }
+        public int VMESS_QUIC_Port
+        {
+            get => Settings.VMESS_QUIC_Port;
+            set
+            {
+                Settings.VMESS_QUIC_Port = value;
+                RaisePropertyChanged(nameof(VMESS_QUIC_Port));
+            }
+        }
+        public string VMESS_QUIC_ShareLink
+        {
+            get => ShareLink.Build(RayType.VMESS_QUIC, Settings);
+        }
+        #endregion
 
-        private List<string> _kcpTypes = new List<string> { "none", "srtp", "utp", "wechat-video", "dtls", "wireguard", };
-        public List<string> KcpTypes => _kcpTypes;
     }
 
     /// <summary>
@@ -338,8 +423,19 @@ namespace ProxySuper.Core.ViewModels
     /// </summary>
     public partial class XrayEditorViewModel
     {
+        #region VLESS XTLS
 
-        // vless xtls
+        public List<string> FlowList { get => XraySettings.FlowList; }
+
+        public string Flow
+        {
+            get => Settings.Flow;
+            set
+            {
+                Settings.Flow = value;
+                RaisePropertyChanged(nameof(Flow));
+            }
+        }
         public bool Checked_VLESS_TCP_XTLS
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP_XTLS);
@@ -353,8 +449,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP_XTLS, Settings);
         }
+        #endregion
 
-        // vless tcp
+        #region VLESS TCP
         public bool Checked_VLESS_TCP
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP);
@@ -368,9 +465,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP, Settings);
         }
+        #endregion
 
-
-        // vless ws
+        #region VLESS WS
         public string VLESS_WS_Path
         {
             get => Settings.VLESS_WS_Path;
@@ -392,12 +489,68 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_WS, Settings);
         }
+        #endregion
 
-        // vless kcp
+        #region VLESS QUIC
+        public string VLESS_QUIC_Key
+        {
+            get => Settings.VLESS_QUIC_Key; set
+            {
+                Settings.VLESS_QUIC_Key = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Key));
+            }
+        }
+        public bool Checked_VLESS_QUIC
+        {
+            get => Settings.Types.Contains(RayType.VLESS_QUIC);
+            set
+            {
+                CheckBoxChanged(value, RayType.VLESS_QUIC);
+                RaisePropertyChanged(nameof(Checked_VLESS_QUIC));
+            }
+        }
+        public string VLESS_QUIC_Security
+        {
+            get => Settings.VLESS_QUIC_Security;
+            set
+            {
+                Settings.VLESS_QUIC_Security = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Security));
+            }
+        }
+        public string VLESS_QUIC_Type
+        {
+            get => Settings.VLESS_QUIC_Type;
+            set
+            {
+                Settings.VLESS_QUIC_Type = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Type));
+            }
+        }
+        public int VLESS_QUIC_Port
+        {
+            get => Settings.VLESS_QUIC_Port;
+            set
+            {
+                Settings.VLESS_QUIC_Port = value;
+                RaisePropertyChanged(nameof(VLESS_QUIC_Port));
+            }
+        }
+        public string VLESS_QUIC_ShareLink
+        {
+            get => ShareLink.Build(RayType.VLESS_QUIC, Settings);
+        }
+        #endregion
+
+        #region VLESS KCP
         public string VLESS_KCP_Seed
         {
             get => Settings.VLESS_KCP_Seed;
-            set => Settings.VLESS_KCP_Seed = value;
+            set
+            {
+                Settings.VLESS_KCP_Seed = value;
+                RaisePropertyChanged(nameof(VLESS_KCP_Seed));
+            }
         }
         public string VLESS_KCP_Type
         {
@@ -424,8 +577,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_KCP, Settings);
         }
+        #endregion
 
-        // vless grpc
+        #region VLESS gRPC
         public string VLESS_gRPC_ServiceName
         {
             get => Settings.VLESS_gRPC_ServiceName;
@@ -449,6 +603,7 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
         }
+        #endregion
     }
 
 }

ProxySuper.Core/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

ProxySuper.Core/packages.config

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="7.1.2" targetFramework="net461" />
-  <package id="QRCoder" version="1.4.1" targetFramework="net461" />
-  <package id="SSH.NET" version="2020.0.1" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
+  <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
+  <package id="QRCoder" version="1.4.3" targetFramework="net472" />
+  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Console" version="4.3.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
 </packages>

ProxySuper.WPF/App.config

@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

ProxySuper.WPF/App.xaml

@@ -6,12 +6,12 @@
              xmlns:ui="http://schemas.modernwpf.com/2019"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
+
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!--Languages-->
+                <!--Language-->
                 <ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
-
-                <!--styles-->
+                <!--style-->
                 <ResourceDictionary>
                     <Style TargetType="{x:Type TextBox}">
                         <Setter Property="Padding" Value="5,2" />
@@ -24,7 +24,7 @@
                     </Style>
                 </ResourceDictionary>
 
-                <!--components styles-->
+                <!--component style-->
                 <ResourceDictionary Source="/Resources/Styles/DataGridStyle.xaml" />
 
             </ResourceDictionary.MergedDictionaries>

ProxySuper.WPF/App.xaml.cs

@@ -11,7 +11,7 @@ namespace ProxySuper.WPF
     {
         protected override void RegisterSetup()
         {
-            this.RegisterSetupType<MvxWpfSetup<Core.App>>();
+            this.RegisterSetupType<Setup>();
         }
     }
 }

ProxySuper.WPF/Controls/HostControl.xaml

@@ -17,7 +17,7 @@
     
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="300" />
+            <RowDefinition Height="330" />
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         
@@ -36,6 +36,7 @@
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
+                    <RowDefinition Height="36" />
                 </Grid.RowDefinitions>
 
                 <Grid.ColumnDefinitions>
@@ -105,7 +106,18 @@
                             Converter={StaticResource SecretTypeConverter},
                             ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
                         }"
-                        Content="{DynamicResource HostUploadSecretKey}" /> 
+                        Content="{DynamicResource HostUploadSecretKey}" />
+
+                <Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" Grid.Row="7" Grid.Column="0" />
+                <TextBox Grid.Row="7" Grid.Column="1"
+                         Width="170"
+                         Text="{Binding Host.PrivateKeyPassPhrase}"
+                         IsEnabled="{
+                            Binding Host.SecretType,
+                            Converter={StaticResource SecretTypeConverter},
+                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
+                        }"
+                         VerticalContentAlignment="Center" />
             </Grid>
         </GroupBox>
 

ProxySuper.WPF/Controls/V2raySettingsControl.xaml

@@ -11,322 +11,460 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
-    <StackPanel Orientation="Horizontal">
-        <StackPanel Width="220">
-            <!--TCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_TCP}">
-                <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
+        <!--节点类型-->
+        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
+            <StackPanel Orientation="Horizontal">
+                <!--#region VLESS -->
+                <WrapPanel Orientation="Vertical">
+                    <!--TCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_TCP}">
+                        <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_WS}">
-                <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_WS}">
+                        <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
-                      IsChecked="{Binding Path=Checked_VLESS_KCP}">
-                <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--mKCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_KCP}">
+                        <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--gRPC-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
-                      IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--quic-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_QUIC}">
+                        <Label Content="{DynamicResource VlessQuicDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--TCP-->
-            <!--<CheckBox Content="VMESS over TCP with TLS&#x0a;不推荐" 
-                    Margin="0,15,0,0"
-                    FontSize="13"
-                    Style="{StaticResource MahApps.Styles.CheckBox}"
-                    IsChecked="{Binding Path=Checked_VMESS_TCP}" />-->
+                    <!--gRPC-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_gRPC}">
+                        <Label  Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
 
-            <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VMESS_WS}">
-                <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
-            </CheckBox>
+                <!--#region VMESS -->
+                <WrapPanel Orientation="Vertical">
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_WS}">
+                        <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
+                    </CheckBox>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VMESS_KCP}">
-                <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
-            </CheckBox>
+                    <!--mKCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_KCP}">
+                        <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
+                    </CheckBox>
 
-            <!--ss-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=CheckedShadowSocks}">
-                <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
-            </CheckBox>
+                    <!--quic-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="Blue"
+                              IsChecked="{Binding Path=Checked_VMESS_QUIC}">
+                        <Label Content="{DynamicResource VmessQuicDesc}" FontSize="12" Foreground="Blue" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
 
-            <!--Trojan-->
-            <CheckBox Margin="0,15,0,0"
-                      Foreground="CadetBlue"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_Trojan_TCP}">
-                <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
-            </CheckBox>
+                <!--#region SS And Trojan -->
+                <WrapPanel Orientation="Vertical">
+                    <!--ss-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=CheckedShadowSocks}">
+                        <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
+                    </CheckBox>
 
-        </StackPanel>
+                    <!--Trojan-->
+                    <CheckBox Width="150"
+                              Foreground="CadetBlue"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_Trojan_TCP}">
+                        <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
+            </StackPanel>
+        </GroupBox>
 
         <!--************************** 参数 **************************-->
 
-        <StackPanel>
-
-            <!--Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=Domain}" Width="200"  />
-            </StackPanel>
-
-            <!--Mask Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
-                <CheckBox IsChecked="{Binding Path=WithTLS}" 
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </StackPanel>
-
-            <!--UUID-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayUUID}" Width="120" />
-
-                <TextBox Text="{Binding Path=UUID}"
-                            Width="200" />
-
-                <Button Margin="5,0,0,0"
-                        Padding="12,3"
-                        Command="{Binding Path=RandomUuid}"
-                        Content="{DynamicResource Random}" />
-            </StackPanel>
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_WS_Path}"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" Orientation="Horizontal">
-
-                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
-                <ComboBox Width="200" 
-                        ItemsSource="{Binding Path=KcpTypes}"
-                        SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" 
-                Orientation="Horizontal">
-                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
-            </StackPanel>
-
-            <!--gRPC Port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_gRPC,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_VLESS_gRPC,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
-            </StackPanel>
-
-            <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>-->
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_WS_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal"
-                        Visibility="{
-                            Binding Path=Checked_VMESS_KCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
-                <ComboBox Width="200" 
-                          VerticalAlignment="Bottom"
-                          ItemsSource="{Binding Path=KcpTypes}"
-                          SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
-            </StackPanel>
-
-            <!--ss密码-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPassword}"
-                        Width="200"/>
-            </StackPanel>
-
-            <!--ss加密方式-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
-                <ComboBox Width="200"
-                        ItemsSource="{Binding ShadowSocksMethods}"
-                        SelectedValue="{Binding ShadowSocksMethod}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--ss端口-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
-            </StackPanel>
-
-            <!--Trojan密码-->
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_Trojan_TCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
-                <TextBox Text="{Binding Path=TrojanPassword}" 
-                                Width="200" />
-            </StackPanel>
-
-            <!--xray prot-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
-                <TextBox Text="{Binding Path=Port}" Width="120"  />
-                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
-            </StackPanel>
-
-            <!--多用户-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Vertical">
+        <!--参数设置-->
+        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
+            <StackPanel>
+                <!--#region Common Settings -->
+                <!--Domain-->
                 <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+                    <Label Content="{DynamicResource XrayDomain}" Width="120"  />
+                    <TextBox Text="{Binding Path=Domain}" Width="200"  />
+                </StackPanel>
 
-                    <TextBox Text="{Binding Path=MultiUUID}"
-                             Height="60"
-                             TextWrapping="Wrap"
-                             Width="200" />
+                <!--UUID-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayUUID}" Width="120" />
+                    <TextBox Text="{Binding Path=UUID}" Width="200" />
+                    <Button Margin="5,0,0,0"
+                            Padding="12,3"
+                            Command="{Binding Path=RandomUuid}"
+                            Content="{DynamicResource Random}" />
                 </StackPanel>
-                <StackPanel>
-                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+
+                <!--v2ray prot-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource V2rayPort}"  Width="120"  />
+                    <TextBox Text="{Binding Path=Port}" Width="120"  />
+                    <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
                 </StackPanel>
+                <!--#endregion-->
+
+                <!--more params-->
+                <Expander ExpandDirection="Down" Margin="0,10,0,0">
+                    <Expander.Header>
+                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
+                    </Expander.Header>
+
+                    <Expander.Content>
+                        <StackPanel>
+                            <!--#region Cert Settings -->
+                            <!--证书-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
+                                <CheckBox IsChecked="{Binding Path=WithTLS}" 
+                              Content="{DynamicResource XrayWithTLSDesc}"
+                              VerticalContentAlignment="Center"
+                              VerticalAlignment="Center" />
+                            </StackPanel>
+                            <!--#endregion-->
+                            
+                            <!--Mask Domain-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
+                            </StackPanel>
+
+                            <!--#region VLESS WebSocket Settings -->
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_WS,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="200" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS KCP Settings -->
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }"
+                                Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
+                                <ComboBox Width="200" 
+                                  ItemsSource="{Binding Path=KcpTypes}"
+                                  SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }" 
+                                Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS Quic Settings -->
+                            <!--quic port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicPort}"  Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_QUIC_Port}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic key-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicKey}"  Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_QUIC_Key}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic security-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicSecurity}" Foreground="LimeGreen" Width="120" />
+                                <ComboBox Width="260"
+                                ItemsSource="{Binding QuicSecurities}"
+                                SelectedValue="{Binding VLESS_QUIC_Security}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--quic type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicType}" Foreground="LimeGreen" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=QuicTypes}"
+                                            SelectedValue="{Binding VLESS_QUIC_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+                            <!--#endregion-->
+                            
+                            <!--#region VLESS gRPC Settings -->
+                            <!--gRPC Port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_gRPC,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
+                            </StackPanel>
+
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VMESS WebSocket Settings -->
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_WS_Path}"
+                                 VerticalAlignment="Bottom"
+                                 Width="200" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VMESS KCP Settings -->
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="200" 
+                                  VerticalAlignment="Bottom"
+                                  ItemsSource="{Binding Path=KcpTypes}"
+                                  SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
+                            </StackPanel>
+                            <!--#endregion-->
+                            
+                            <!--#region VMESS Quic Settings -->
+                            <!--quic port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicPort}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_QUIC_Port}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic key-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicKey}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_QUIC_Key}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic security-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicSecurity}" Foreground="Blue" Width="120" />
+                                <ComboBox Width="260"
+                                ItemsSource="{Binding QuicSecurities}"
+                                SelectedValue="{Binding VMESS_QUIC_Security}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--quic type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=QuicTypes}"
+                                            SelectedValue="{Binding VMESS_QUIC_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region ShadowSocks Settings -->
+                            <!--ss密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="200"/>
+                            </StackPanel>
+
+                            <!--ss加密方式-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
+                                <ComboBox Width="200"
+                                  ItemsSource="{Binding ShadowSocksMethods}"
+                                  SelectedValue="{Binding ShadowSocksMethod}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--ss端口-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region Trojan Settings -->
+                            <!--Trojan密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=Checked_Trojan_TCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
+                                <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region Multiple Users Settings -->
+                            <!--多用户-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+
+                                    <TextBox Text="{Binding Path=MultiUUID}"
+                                     Height="60"
+                                     TextWrapping="Wrap"
+                                     Width="200" />
+                                </StackPanel>
+                                <StackPanel>
+                                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+                                </StackPanel>
+                            </StackPanel>
+                            <!--#endregion-->
+                        </StackPanel>
+                    </Expander.Content>
+                </Expander>
             </StackPanel>
-        </StackPanel>
+        </GroupBox>
     </StackPanel>
 
 </UserControl>

ProxySuper.WPF/Controls/VLESS_QUIC_Control.xaml

@@ -0,0 +1,61 @@
+<UserControl x:Class="ProxySuper.WPF.Controls.VLESS_QUIC_Control"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ProxySuper.WPF.Controls"
+             mc:Ignorable="d">
+    <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="地址(address)" Width="140" />
+            <TextBox Text="{Binding Settings.Domain}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="端口(port)" Width="140" />
+            <TextBox Text="{Binding Path=Settings.VLESS_QUIC_Port,Mode=OneTime}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="用户ID(id)" Width="140" />
+            <TextBox Text="{Binding Settings.UUID}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="加密(security)" Width="140" />
+            <TextBox Text="none" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="传输协议(network)" Width="140" />
+            <TextBox Text="quic" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="伪装类型(type)" Width="140" />
+            <TextBox Text="{Binding Settings.VLESS_QUIC_Type}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="伪装域名(host)" Width="140" />
+            <TextBox Text="{Binding Settings.VLESS_QUIC_Security}" IsReadOnly="True" Width="300" />
+            <Label Content="QUIC加密方式" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="路径(path)" Width="140" />
+            <TextBox Text="{Binding Settings.VLESS_QUIC_Key}" IsReadOnly="True" Width="300" />
+            <Label Content="QUIC密钥" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="传输安全(tls)" Width="140" />
+            <TextBox Text="" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="分享链接(ShareLink)" Width="140" />
+            <TextBox Text="{Binding Settings.VLESS_QUIC_ShareLink,Mode=OneTime}" Width="300" IsReadOnly="True" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>

ProxySuper.WPF/Controls/VLESS_QUIC_Control.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ProxySuper.WPF.Controls
+{
+    /// <summary>
+    /// VLESS_QUIC_Control.xaml 的交互逻辑
+    /// </summary>
+    public partial class VLESS_QUIC_Control : UserControl
+    {
+        public VLESS_QUIC_Control()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml

@@ -23,7 +23,12 @@
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
             <Label Content="流控(flow)" Width="140" />
-            <TextBox Text="xtls-rprx-direct" IsReadOnly="True" Width="300" />
+            <TextBox Text="{Binding Settings.Flow}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="uTLS" Width="140" />
+            <TextBox Text="{Binding Settings.UTLS}" IsReadOnly="True" Width="300" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
@@ -53,7 +58,7 @@
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
             <Label Content="传输安全(tls)" Width="140" />
-            <TextBox Text="xtls" IsReadOnly="True" Width="300" />
+            <TextBox Text="tls" IsReadOnly="True" Width="300" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

ProxySuper.WPF/Controls/VMESS_QUIC_Control.xaml

@@ -0,0 +1,62 @@
+<UserControl x:Class="ProxySuper.WPF.Controls.VMESS_QUIC_Control"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ProxySuper.WPF.Controls"
+             mc:Ignorable="d">
+
+    <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="地址(address)" Width="140" />
+            <TextBox Text="{Binding Settings.Domain}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="端口(port)" Width="140" />
+            <TextBox Text="{Binding Path=Settings.VMESS_QUIC_Port,Mode=OneTime}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="用户ID(id)" Width="140" />
+            <TextBox Text="{Binding Settings.UUID}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="加密(security)" Width="140" />
+            <TextBox Text="none" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="传输协议(network)" Width="140" />
+            <TextBox Text="quic" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="伪装类型(type)" Width="140" />
+            <TextBox Text="{Binding Settings.VMESS_QUIC_Type}" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="伪装域名(host)" Width="140" />
+            <TextBox Text="{Binding Settings.VMESS_QUIC_Security}" IsReadOnly="True" Width="300" />
+            <Label Content="QUIC加密方式" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="路径(path)" Width="140" />
+            <TextBox Text="{Binding Settings.VMESS_QUIC_Key}" IsReadOnly="True" Width="300" />
+            <Label Content="QUIC密钥" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="传输安全(tls)" Width="140" />
+            <TextBox Text="" IsReadOnly="True" Width="300" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+            <Label Content="分享链接(ShareLink)" Width="140" />
+            <TextBox Text="{Binding Settings.VMESS_QUIC_ShareLink,Mode=OneTime}" Width="300" IsReadOnly="True" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>

ProxySuper.WPF/Controls/VMESS_QUIC_Control.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ProxySuper.WPF.Controls
+{
+    /// <summary>
+    /// VMESS_QUIC_Control.xaml 的交互逻辑
+    /// </summary>
+    public partial class VMESS_QUIC_Control : UserControl
+    {
+        public VMESS_QUIC_Control()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Controls/XraySettingsControl.xaml

@@ -11,329 +11,491 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
-    <StackPanel Orientation="Horizontal">
-        <StackPanel Width="220">
-            <!--XTLS-->
-            <CheckBox Margin="0,10,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
-                <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
+        <!--节点类型-->
+        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
+            <StackPanel Orientation="Horizontal">
+                <!--#region VLESS -->
+                <WrapPanel Orientation="Vertical">
+                    <!--XTLS-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
+                        <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--TCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_TCP}">
-                <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--TCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_TCP}">
+                        <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_WS}">
-                <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_WS}">
+                        <Label Content="{DynamicResource VlessWsDesc}"  FontSize="12"  Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
+                    <!--mKCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_KCP}">
-                <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                        <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--gRPC-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
-                      IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--quic-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_QUIC}">
+                        <Label Content="{DynamicResource VlessQuicDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--TCP-->
-            <!--<CheckBox Content="VMESS over TCP with TLS&#x0a;不推荐" 
-                    Margin="0,15,0,0"
-                    FontSize="13"
-                    Style="{StaticResource MahApps.Styles.CheckBox}"
-                    IsChecked="{Binding Path=Checked_VMESS_TCP}" />-->
+                    <!--gRPC-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_gRPC}">
+                        <Label Content="{DynamicResource VlessRpcDesc}" FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
 
-            <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VMESS_WS}">
-                <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
-            </CheckBox>
+                <!--#region VMESS -->
+                <WrapPanel Orientation="Vertical">
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_WS}">
+                        <Label Content="{DynamicResource VmessWsDesc}" FontSize="12" Foreground="Blue" />
+                    </CheckBox>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VMESS_KCP}">
-                <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
-            </CheckBox>
+                    <!--mKCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_KCP}">
+                        <Label Foreground="Blue" FontSize="12" Content="{DynamicResource VmessKcpDesc}" />
+                    </CheckBox>
 
-            <!--ss-->
-            <CheckBox Margin="0,15,0,0"
+                    <!--quic-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="Blue"
+                              IsChecked="{Binding Path=Checked_VMESS_QUIC}">
+                        <Label Content="{DynamicResource VmessQuicDesc}" FontSize="12" Foreground="Blue" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
+
+                <!--#region SS And Trojan -->
+                <WrapPanel Orientation="Vertical">
+                    <!--ss-->
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=CheckedShadowSocks}">
-                <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
-            </CheckBox>
+                        <Label Content="{DynamicResource SSDesc}" FontSize="12"  Foreground="Fuchsia" />
+                    </CheckBox>
 
-            <!--Trojan-->
-            <CheckBox Margin="0,15,0,0"
+                    <!--Trojan-->
+                    <CheckBox Width="150"
                       Foreground="CadetBlue"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_Trojan_TCP}">
-                <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
-            </CheckBox>
-
-        </StackPanel>
-
-        <!--************************** 参数 **************************-->
-
-        <StackPanel>
-
-            <!--Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=Domain}" Width="200"  />
+                        <Label Content="{DynamicResource TrojanDesc}"  FontSize="12" Foreground="CadetBlue" />
+                    </CheckBox>
+                </WrapPanel>
+                <!--#endregion-->
             </StackPanel>
+        </GroupBox>
 
-            <!--Mask Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
-                <CheckBox IsChecked="{Binding Path=WithTLS}" 
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </StackPanel>
-
-            <!--UUID-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayUUID}" Width="120" />
-
-                <TextBox Text="{Binding Path=UUID}"
-                            Width="200" />
-
-                <Button Margin="5,0,0,0"
-                        Padding="12,3"
-                        Command="{Binding Path=RandomUuid}"
-                        Content="{DynamicResource Random}" />
-            </StackPanel>
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_WS_Path}"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" Orientation="Horizontal">
-
-                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
-                <ComboBox Width="200" 
-                        ItemsSource="{Binding Path=KcpTypes}"
-                        SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" 
-                Orientation="Horizontal">
-                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
-            </StackPanel>
-
-            <!--gRPC Port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_gRPC,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_VLESS_gRPC,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
-            </StackPanel>
-
-            <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>-->
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_WS_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal"
-                        Visibility="{
-                            Binding Path=Checked_VMESS_KCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
-                <ComboBox Width="200" 
-                          VerticalAlignment="Bottom"
-                          ItemsSource="{Binding Path=KcpTypes}"
-                          SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
-            </StackPanel>
-
-            <!--ss密码-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPassword}"
-                        Width="200"/>
-            </StackPanel>
-
-            <!--ss加密方式-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
-                <ComboBox Width="200"
-                        ItemsSource="{Binding ShadowSocksMethods}"
-                        SelectedValue="{Binding ShadowSocksMethod}">
-                </ComboBox>
-            </StackPanel>
-            
-            <!--ss端口-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
-            </StackPanel>
-
-            <!--Trojan密码-->
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_Trojan_TCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
-                <TextBox Text="{Binding Path=TrojanPassword}" 
-                                Width="200" />
-            </StackPanel>
-
-            <!--xray prot-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
-                <TextBox Text="{Binding Path=Port}" Width="120"  />
-                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
-            </StackPanel>
-
-            <!--多用户-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Vertical">
+        <!--参数设置-->
+        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
+            <StackPanel>
+                <!--#region Base Settings -->
+                <!--Domain-->
                 <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+                    <Label Content="{DynamicResource XrayDomain}" Width="120" />
+                    <TextBox Text="{Binding Path=Domain}" Width="260"  />
+                </StackPanel>
 
-                    <TextBox Text="{Binding Path=MultiUUID}"
-                             Height="60"
-                             TextWrapping="Wrap"
-                             Width="200" />
+                <!--UUID-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayUUID}" Width="120" />
+
+                    <TextBox Text="{Binding Path=UUID}"
+                            Width="260" />
+
+                    <Button Margin="5,0,0,0"
+                            Padding="12,3"
+                            Command="{Binding Path=RandomUuid}"
+                            Content="{DynamicResource Random}" />
                 </StackPanel>
-                <StackPanel>
-                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+
+                <!--xray prot-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayPort}" Width="120"  />
+                    <TextBox Text="{Binding Path=Port}" Width="120"  />
+                    <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
                 </StackPanel>
+                <!--#endregion-->
+
+                <!--more params-->
+                <Expander ExpandDirection="Down" Margin="0,10,0,0">
+                    <Expander.Header>
+                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
+                    </Expander.Header>
+
+                    <Expander.Content>
+                        <StackPanel>
+                            <!--#region Common Settings -->
+                            <!--xray utls-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource UTLS}" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                          VerticalAlignment="Bottom"
+                                          ItemsSource="{Binding Path=UTLSList}"
+                                          SelectedValue="{Binding UTLS,Mode=TwoWay}" />
+                            </StackPanel>
+
+                            <!--Flow-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_TCP_XTLS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource Flow}" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                          VerticalAlignment="Bottom"
+                                          ItemsSource="{Binding Path=FlowList}"
+                                          SelectedValue="{Binding Flow,Mode=TwoWay}" />
+                            </StackPanel>
+
+                            <!--Cert-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
+                                <CheckBox IsChecked="{Binding Path=WithTLS}" 
+                                          Content="{DynamicResource XrayWithTLSDesc}"
+                                          VerticalContentAlignment="Center"
+                                          VerticalAlignment="Center" />
+                            </StackPanel>
+
+                            <!--Mask Domain-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                                <TextBox Text="{Binding Path=MaskDomain}" Width="260"  />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS WS Settings -->
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="260" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS KCP SETTINGS -->
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="260"  />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }"
+                                        Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
+                                <ComboBox Width="260" 
+                                ItemsSource="{Binding Path=KcpTypes}"
+                                SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }" 
+                                        Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="260"  />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS Quic Settings -->
+                            <!--quic port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicPort}"  Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_QUIC_Port}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic key-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicKey}"  Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_QUIC_Key}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic security-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicSecurity}" Foreground="LimeGreen" Width="120" />
+                                <ComboBox Width="260"
+                                ItemsSource="{Binding QuicSecurities}"
+                                SelectedValue="{Binding VLESS_QUIC_Security}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--quic type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessQuicType}" Foreground="LimeGreen" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=QuicTypes}"
+                                            SelectedValue="{Binding VLESS_QUIC_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VLESS GRPC SETTINGS -->
+                            <!--gRPC Port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="260"  />
+                            </StackPanel>
+
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="260"  />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VMESS WS SETTINGS -->
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_WS_Path}"
+                                        VerticalAlignment="Bottom"
+                                        Width="260" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VMESS KCP SETTINGS -->
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="260" />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=KcpTypes}"
+                                            SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="260" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region VMESS Quic Settings -->
+                            <!--quic port-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicPort}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_QUIC_Port}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic key-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicKey}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_QUIC_Key}" Width="260" />
+                            </StackPanel>
+
+                            <!--quic security-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicSecurity}" Foreground="Blue" Width="120" />
+                                <ComboBox Width="260"
+                                ItemsSource="{Binding QuicSecurities}"
+                                SelectedValue="{Binding VMESS_QUIC_Security}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--quic type-->
+                            <StackPanel Margin="0,15,0,0"
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_QUIC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessQuicType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="260" 
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=QuicTypes}"
+                                            SelectedValue="{Binding VMESS_QUIC_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region ShadowSocks Settings -->
+                            <!--ss密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="260"/>
+                            </StackPanel>
+
+                            <!--ss加密方式-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
+                                <ComboBox Width="260"
+                                ItemsSource="{Binding ShadowSocksMethods}"
+                                SelectedValue="{Binding ShadowSocksMethod}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--ss端口-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="260"/>
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region Trojan Settings -->
+                            <!--Trojan密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_Trojan_TCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
+                                <TextBox Text="{Binding Path=TrojanPassword}" Width="260" />
+                            </StackPanel>
+                            <!--#endregion-->
+
+                            <!--#region Multiple Users Settings -->
+                            <!--多用户-->
+                            <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+
+                                    <TextBox Text="{Binding Path=MultiUUID}"
+                                             Height="60"
+                                             TextWrapping="Wrap"
+                                             Width="260" />
+                                </StackPanel>
+
+                                <StackPanel>
+                                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+                                </StackPanel>
+                            </StackPanel>
+                            <!--#endregion-->
+                        </StackPanel>
+                    </Expander.Content>
+                </Expander>
             </StackPanel>
-        </StackPanel>
+        </GroupBox>
     </StackPanel>
-
 </UserControl>

ProxySuper.WPF/MainWindow.xaml

@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Icon="/Resources/ProxySU.ico"
-        Title="ProxySU" Height="600" Width="1000">
+        Title="ProxySU   v4.1.10" Height="600" Width="1000">
     <Grid>
         
     </Grid>

ProxySuper.WPF/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.4.0")]
-[assembly: AssemblyFileVersion("4.0.4.0")]
+[assembly: AssemblyVersion("4.1.10.0")]
+[assembly: AssemblyFileVersion("4.1.10.0")]

ProxySuper.WPF/ProxySuper.WPF.csproj

@@ -32,19 +32,25 @@
     <StartupObject>ProxySuper.WPF.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MvvmCross, Version=7.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmCross.7.1.2\lib\net461\MvvmCross.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="MvvmCross.Platforms.Wpf, Version=7.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmCross.Platforms.Wpf.7.1.2\lib\net461\MvvmCross.Platforms.Wpf.dll</HintPath>
+    <Reference Include="MvvmCross, Version=8.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmCross.8.0.2\lib\net461\MvvmCross.dll</HintPath>
     </Reference>
-    <Reference Include="QRCoder, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\QRCoder.1.4.1\lib\net40\QRCoder.dll</HintPath>
+    <Reference Include="MvvmCross.Platforms.Wpf, Version=8.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmCross.Platforms.Wpf.8.0.2\lib\net461\MvvmCross.Platforms.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2020.0.1.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2020.0.1\lib\net40\Renci.SshNet.dll</HintPath>
+    <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
+      <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
+    </Reference>
+    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -52,6 +58,16 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
@@ -96,6 +112,9 @@
     <Compile Include="Controls\VLESS_KCP_Control.xaml.cs">
       <DependentUpon>VLESS_KCP_Control.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\VLESS_QUIC_Control.xaml.cs">
+      <DependentUpon>VLESS_QUIC_Control.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\VLESS_TCP_TLS_Control.xaml.cs">
       <DependentUpon>VLESS_TCP_TLS_Control.xaml</DependentUpon>
     </Compile>
@@ -108,6 +127,9 @@
     <Compile Include="Controls\VMESS_KCP_Control.xaml.cs">
       <DependentUpon>VMESS_KCP_Control.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\VMESS_QUIC_Control.xaml.cs">
+      <DependentUpon>VMESS_QUIC_Control.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\VMESS_TCP_TLS_Control.xaml.cs">
       <DependentUpon>VMESS_TCP_TLS_Control.xaml</DependentUpon>
     </Compile>
@@ -120,6 +142,7 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Setup.cs" />
     <Compile Include="Views\Brook\BrookConfigView.xaml.cs">
       <DependentUpon>BrookConfigView.xaml</DependentUpon>
     </Compile>
@@ -135,6 +158,15 @@
     <Compile Include="Views\HomeView.xaml.cs">
       <DependentUpon>HomeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Hysteria\HysteriaConfigView.xaml.cs">
+      <DependentUpon>HysteriaConfigView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Hysteria\HysteriaEditorView.xaml.cs">
+      <DependentUpon>HysteriaEditorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Hysteria\HysteriaInstallView.xaml.cs">
+      <DependentUpon>HysteriaInstallView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MTProxyGo\MTProxyGoConfigView.xaml.cs">
       <DependentUpon>MTProxyGoConfigView.xaml</DependentUpon>
     </Compile>
@@ -211,6 +243,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Controls\VLESS_QUIC_Control.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Controls\VLESS_TCP_TLS_Control.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -227,6 +263,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Controls\VMESS_QUIC_Control.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Controls\VMESS_TCP_TLS_Control.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -277,6 +317,11 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Page>
+    <Page Include="Resources\Languages\fa_IR.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Page>
     <Page Include="Resources\Languages\zh_cn.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -287,6 +332,18 @@
       <Generator>MSBuild:Compile</Generator>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Page>
+    <Page Include="Views\Hysteria\HysteriaConfigView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Hysteria\HysteriaEditorView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Hysteria\HysteriaInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MTProxyGo\MTProxyGoConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -375,6 +432,9 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="Templates\Hysteria\config.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\NaiveProxy\naive_server.caddyfile">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -462,6 +522,9 @@
     <None Include="Templates\v2ray\server\05_inbounds\VLESS_KCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Templates\v2ray\server\05_inbounds\VLESS_QUIC.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\v2ray\server\05_inbounds\VLESS_TCP_TLS.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -474,6 +537,9 @@
     <None Include="Templates\v2ray\server\05_inbounds\VMESS_KCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Templates\v2ray\server\05_inbounds\VMESS_QUIC.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\v2ray\server\05_inbounds\VMESS_TCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -570,6 +636,9 @@
     <None Include="Templates\xray\server\05_inbounds\VLESS_KCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Templates\xray\server\05_inbounds\VLESS_QUIC.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\xray\server\05_inbounds\VLESS_TCP_XTLS.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -582,6 +651,9 @@
     <None Include="Templates\xray\server\05_inbounds\VMESS_KCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Templates\xray\server\05_inbounds\VMESS_QUIC.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\xray\server\05_inbounds\VMESS_TCP.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

ProxySuper.WPF/Resources/Languages/en.xaml

@@ -22,6 +22,7 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">فارسی</sys:String>
 
     <sys:String x:Key="MainMenuHelper">Helper</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
@@ -39,7 +40,7 @@
     <sys:String x:Key="MainDataGridColumnActionViewConfig">ViewConfig</sys:String>
     <sys:String x:Key="MainDataGridColumnActionDelete">Delete</sys:String>
     <sys:String x:Key="MainDataGridColumnActionSortUp">Up</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionSortDone">Done</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortDone">Down</sys:String>
 
 
     <!--Editor Window-->
@@ -53,6 +54,7 @@
     <sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
     <sys:String  x:Key="HostSertTypePassword">Password</sys:String>
     <sys:String  x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>
+    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">PKPassword</sys:String>
 
 
     <sys:String x:Key="ProxyGroupName">Proxy</sys:String>
@@ -64,42 +66,60 @@
     <sys:String x:Key="ProxyTypeNone">None</sys:String>
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
-
+    
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">Proxy Type</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
 
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS over TCP With XTLS&#x0a;Preferred</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;XTLS is Preferred</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;Support CDN</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;low delay，without Domain</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;Support CDN</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;low delay，without Domian</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;Support UDP，without Domain</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
+    <sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
+    <sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
     <sys:String x:Key="XrayDomain">Domain/IP</sys:String>
     <sys:String x:Key="XrayMarkDomain">Redir Url</sys:String>
     <sys:String x:Key="XrayWithTLS">With TLS</sys:String>
     <sys:String x:Key="XrayWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
     <sys:String x:Key="XrayUUID">UUID</sys:String>
+    <sys:String x:Key="Flow">Flow</sys:String>
+    <sys:String x:Key="UTLS">uTLS</sys:String>
     <sys:String x:Key="MultiUser">Multi User</sys:String>
     <sys:String x:Key="MultiUserHelp">Multi Id split with ","</sys:String>
     <sys:String x:Key="VlessWsPath">VLESS WS Path</sys:String>
     <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
     <sys:String x:Key="VlessKcpType">VLESS KCP Type</sys:String>
     <sys:String x:Key="VlessKcpPort">VLESS KCP Port</sys:String>
+    <sys:String x:Key="VlessQuicPort">VLESS QUIC Port</sys:String>
+    <sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
+    <sys:String x:Key="VlessQuicSecurity">VLESS QUIC Security</sys:String>
+    <sys:String x:Key="VlessQuicType">VLESS QUIC Type</sys:String>
     <sys:String x:Key="VlessRPCName">gRPC Service Name</sys:String>
     <sys:String x:Key="VlessRPCPort">gRPC Port</sys:String>
     <sys:String x:Key="VmessWsPath">VMESS WS Path</sys:String>
     <sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
     <sys:String x:Key="VmessKcpType">VMESS KCP Type</sys:String>
     <sys:String x:Key="VmessKcpPort">VMESS KCP Port</sys:String>
+    <sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
+    <sys:String x:Key="VmessQuicPort">VMESS QUIC Port</sys:String>
+    <sys:String x:Key="VmessQuicSecurity">VMESS QUIC Security</sys:String>
+    <sys:String x:Key="VmessQuicType">VMESS QUIC Type</sys:String>    
     <sys:String x:Key="SSPassword">SS Pwd</sys:String>
     <sys:String x:Key="SSMethods">SS Method</sys:String>
     <sys:String x:Key="SSPort">SS Port</sys:String>
     <sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
     <sys:String x:Key="TrojanPort">Trojan Port</sys:String>
+    <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
     <sys:String x:Key="XrayPort">xray Port</sys:String>
     <sys:String x:Key="XrayPortDefault">default port is 443</sys:String>
+    <sys:String x:Key="MoreParameters">More Parameters</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">Install</sys:String>
@@ -132,4 +152,13 @@
     <sys:String x:Key="MTProtoPort">Port</sys:String>
     <sys:String x:Key="MTProtoCleartext">Cleantext</sys:String>
     <sys:String x:Key="MTProtoSecretText">Secret</sys:String>
+    
+    <!--Hysteria-->
+    <sys:String x:Key="HysteriaDomain">Address</sys:String>
+    <sys:String x:Key="HysteriaPort">Port</sys:String>
+    <sys:String x:Key="HysteriaObfs">OBFS</sys:String>
+    <sys:String x:Key="HysteriaProtocol">Protocol</sys:String>
+    <sys:String x:Key="HysteriaEmail">Email</sys:String>
+    <sys:String x:Key="HysteriaUpMbps">UpMbps</sys:String>
+    <sys:String x:Key="HysteriaDownMbps">DownMbps</sys:String>
 </ResourceDictionary>

ProxySuper.WPF/Resources/Languages/fa_IR.xaml

@@ -0,0 +1,164 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <!--common-->
+    <sys:String x:Key="Random">تصادفی</sys:String>
+    <sys:String x:Key="Save">ذخیره</sys:String>
+    <sys:String x:Key="SaveAndInstall">ذخیره و نصب</sys:String>
+    <sys:String x:Key="SaveAs">ذخیره به عنوان</sys:String>
+    <sys:String x:Key="Install">نصب</sys:String>
+    <sys:String x:Key="Settings">تنظیمات</sys:String>
+    <sys:String x:Key="ReadmeWebsiteDemo">موارد زیر یک اتصال صفحه وب ثابت است که توسط کاربران اینترنتی ارائه شده است، لطفاً بررسی کنید که آیا فایل index.html توسط خودتان وجود دارد یا خیر.</sys:String>
+
+    <!--Main Menu-->
+    <sys:String x:Key="MainMenuAddHost">میزبان اضافه کنید</sys:String>
+    <sys:String x:Key="MainMenuActions">عمل کنند</sys:String>
+    <sys:String x:Key="MainMenuActionsExportSettings">پیکربندی صادرات</sys:String>
+    <sys:String x:Key="MainMenuActionsExportSubscribe">اشتراک صادرات</sys:String>
+    <sys:String x:Key="MainMenuActionsGetRoot">اکانت روت را فعال کنید</sys:String>
+
+    <sys:String x:Key="MainMenuLanguage">زبان(Language)</sys:String>
+    <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
+    <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
+    <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">فارسی</sys:String>
+
+    <sys:String x:Key="MainMenuHelper">یاور</sys:String>
+    <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
+    <sys:String x:Key="MainMenuHelperUseRoot">اکانت روت را فعال کنید</sys:String>
+    <sys:String x:Key="MainMenuHelperCertQuestion">در مورد گواهینامه</sys:String>
+    <sys:String x:Key="MainMenuHelperPrivateKey">در مورد سوال</sys:String>
+
+    <!--Main DataGrid-->
+    <sys:String x:Key="MainDataGridColumnTag">برچسب</sys:String>
+    <sys:String x:Key="MainDataGridColumnAddress">آدرس</sys:String>
+    <sys:String x:Key="MainDataGridColumnType">نوع</sys:String>
+    <sys:String x:Key="MainDataGridColumnAction">عمل کنند</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionInstall">نصب</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionEdit">ویرایش</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionViewConfig">مشاهده پیکربندی</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionDelete">حذف</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortUp">بالاا</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortDone">پایین</sys:String>
+
+
+    <!--Editor Window-->
+    <sys:String x:Key="HostGroupName">هاست</sys:String>
+    <sys:String x:Key="HostTag">برچسب</sys:String>
+    <sys:String x:Key="HostAddress">آدرس</sys:String>
+    <sys:String x:Key="HostUserName">نام کاربری</sys:String>
+    <sys:String x:Key="HostPassword">رمز عبور</sys:String>
+    <sys:String x:Key="HostPort">پورت</sys:String>
+    <sys:String x:Key="HostSecretType">نوع تأیید ورود</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">کلید آپلود</sys:String>
+    <sys:String  x:Key="HostSertTypePassword">رمز عبور</sys:String>
+    <sys:String  x:Key="HostSertTypePrivateKey">کلید خصوصی</sys:String>
+    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">رمز عبور PK</sys:String>
+
+
+    <sys:String x:Key="ProxyGroupName">پروکسی</sys:String>
+    <sys:String x:Key="ProxyAddress">آدرس</sys:String>
+    <sys:String x:Key="ProxyPort">پورت</sys:String>
+    <sys:String x:Key="ProxyUserName">نام کاربری</sys:String>
+    <sys:String x:Key="ProxyPassword">رمز عبور</sys:String>
+    <sys:String x:Key="ProxyType">نوع</sys:String>
+    <sys:String x:Key="ProxyTypeNone">None</sys:String>
+    <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
+    <sys:String x:Key="ProxyTypeSocks5">ساکس5</sys:String>
+    
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">نوع پروکسی</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
+
+    <!--Xray-->
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
+    <sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
+    <sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
+
+    <sys:String x:Key="XrayDomain">Domain/IP</sys:String>
+    <sys:String x:Key="XrayMarkDomain">Redir Url</sys:String>
+    <sys:String x:Key="XrayWithTLS">With TLS</sys:String>
+    <sys:String x:Key="XrayWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
+    <sys:String x:Key="XrayUUID">UUID</sys:String>
+    <sys:String x:Key="Flow">Flow</sys:String>
+    <sys:String x:Key="UTLS">uTLS</sys:String>
+    <sys:String x:Key="MultiUser">چند کاربره</sys:String>
+    <sys:String x:Key="MultiUserHelp">چند شناسه تقسیم با ","</sys:String>
+    <sys:String x:Key="VlessWsPath">VLESS WS Path</sys:String>
+    <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
+    <sys:String x:Key="VlessKcpType">VLESS KCP Type</sys:String>
+    <sys:String x:Key="VlessKcpPort">VLESS KCP Port</sys:String>
+    <sys:String x:Key="VlessQuicPort">VLESS QUIC Port</sys:String>
+    <sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
+    <sys:String x:Key="VlessQuicSecurity">VLESS QUIC Security</sys:String>
+    <sys:String x:Key="VlessQuicType">VLESS QUIC Type</sys:String>
+    <sys:String x:Key="VlessRPCName">gRPC Service Name</sys:String>
+    <sys:String x:Key="VlessRPCPort">gRPC Port</sys:String>
+    <sys:String x:Key="VmessWsPath">VMESS WS Path</sys:String>
+    <sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
+    <sys:String x:Key="VmessKcpType">VMESS KCP Type</sys:String>
+    <sys:String x:Key="VmessKcpPort">VMESS KCP Port</sys:String>
+    <sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
+    <sys:String x:Key="VmessQuicPort">VMESS QUIC Port</sys:String>
+    <sys:String x:Key="VmessQuicSecurity">VMESS QUIC Security</sys:String>
+    <sys:String x:Key="VmessQuicType">VMESS QUIC Type</sys:String>    
+    <sys:String x:Key="SSPassword">SS Pwd</sys:String>
+    <sys:String x:Key="SSMethods">SS Method</sys:String>
+    <sys:String x:Key="SSPort">SS Port</sys:String>
+    <sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
+    <sys:String x:Key="TrojanPort">پورت تروجان</sys:String>
+    <sys:String x:Key="V2rayPort">v2ray بندر</sys:String>
+    <sys:String x:Key="XrayPort">xray بندر</sys:String>
+    <sys:String x:Key="XrayPortDefault">پورت پیش فرض 443 است</sys:String>
+    <sys:String x:Key="MoreParameters">پارامترهای بیشتر</sys:String>
+
+    <!--xray installer-->
+    <sys:String x:Key="XrayInstallerInstall">نصب</sys:String>
+    <sys:String x:Key="XrayInstallerUpdateSettings">بروزرسانی تنظیمات</sys:String>
+    <sys:String x:Key="XrayInstallerUpdateCore">بروزرسانی هسته</sys:String>
+    <sys:String x:Key="XrayInstallerUninstall">Uninstall</sys:String>
+    <sys:String x:Key="XrayInstallerInstallCert">InstallCert</sys:String>
+    <sys:String x:Key="XrayInstallerUploadWeb">UploadWeb</sys:String>
+    <sys:String x:Key="XrayInstallerUploadCert">UploadCert</sys:String>
+
+    <!--Trojan-GO-->
+    <sys:String x:Key="TrojanGoWithTLS">With TLS</sys:String>
+    <sys:String x:Key="TrojanGoWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
+    <sys:String x:Key="TrojanGoDomain">آدرس</sys:String>
+    <sys:String x:Key="TrojanGoPort">پورت</sys:String>
+    <sys:String x:Key="TrojanGoPassword">رمزعبور</sys:String>
+    <sys:String x:Key="TrojanGoMaskDomain">GuiseHost</sys:String>
+    <sys:String x:Key="TrojanGoWebSocketPath">WS Path</sys:String>
+    <sys:String x:Key="TrojanGoWebSocketDomain">WS Domain</sys:String>
+
+    <!--Naive Proxy-->
+    <sys:String x:Key="NaiveProxyDomain">آدرس</sys:String>
+    <sys:String x:Key="NaiveProxyPort">پورت</sys:String>
+    <sys:String x:Key="NaiveProxyUserName">نام کاربری</sys:String>
+    <sys:String x:Key="NaiveProxyPassword">رمز عبور</sys:String>
+    <sys:String x:Key="NaiveProxyMaskDomain">GuiseHost</sys:String>
+
+    <!--MTProto Go-->
+    <sys:String x:Key="MTProtoDomain">آدرس</sys:String>
+    <sys:String x:Key="MTProtoPort">پورت</sys:String>
+    <sys:String x:Key="MTProtoCleartext">Cleantext</sys:String>
+    <sys:String x:Key="MTProtoSecretText">رمز</sys:String>
+    
+    <!--Hysteria-->
+    <sys:String x:Key="HysteriaDomain">آدرس</sys:String>
+    <sys:String x:Key="HysteriaPort">پورت</sys:String>
+    <sys:String x:Key="HysteriaObfs">OBFS</sys:String>
+    <sys:String x:Key="HysteriaProtocol">Protocol</sys:String>
+    <sys:String x:Key="HysteriaEmail">ایمیل</sys:String>
+    <sys:String x:Key="HysteriaUpMbps">UpMbps</sys:String>
+    <sys:String x:Key="HysteriaDownMbps">DownMbps</sys:String>
+</ResourceDictionary>

ProxySuper.WPF/Resources/Languages/tw_cn.xaml

@@ -22,6 +22,8 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">فارسی</sys:String>
+
     <sys:String x:Key="MainMenuHelper">幫助</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
     <sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>
@@ -53,6 +55,7 @@
     <sys:String x:Key="HostUploadSecretKey">上傳Key</sys:String>
     <sys:String x:Key="HostSertTypePassword">密碼</sys:String>
     <sys:String x:Key="HostSertTypePrivateKey">私鑰</sys:String>
+    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私鑰密碼</sys:String>
 
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@@ -64,15 +67,22 @@
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
 
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">節點類型</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">節點參數</sys:String>
+
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS Over TCP With XTLS&#x0a;性能數倍，首選方式。</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;仍推薦XTLS。</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;推薦，支持CDN。</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;遊戲推薦，延遲低，免域名。</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;推薦，支持CDN。</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;遊戲推薦，延遲低，免域名。</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;SS，支持udp，免域名。</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan。</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
+    <sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
+    <sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
 
     <sys:String x:Key="XrayDomain">域名/IP</sys:String>
@@ -80,25 +90,37 @@
     <sys:String x:Key="XrayWithTLS">自動申請證書</sys:String>
     <sys:String x:Key="XrayWithTLSDesc">如上傳自有證書，則取消對勾。</sys:String>
     <sys:String x:Key="XrayUUID">UUID</sys:String>
+    <sys:String x:Key="Flow">流控</sys:String>
+    <sys:String x:Key="UTLS">uTLS</sys:String>
     <sys:String x:Key="MultiUser">多用戶</sys:String>
     <sys:String x:Key="MultiUserHelp">多個UUID用“,”分隔</sys:String>
     <sys:String x:Key="VlessWsPath">VLESS WS路徑</sys:String>
     <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
     <sys:String x:Key="VlessKcpType">VLESS KCP偽裝</sys:String>
     <sys:String x:Key="VlessKcpPort">VLESS KCP端口</sys:String>
+    <sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
+    <sys:String x:Key="VlessQuicPort">VLESS QUIC端口</sys:String>
+    <sys:String x:Key="VlessQuicSecurity">VLESS QUIC加密</sys:String>
+    <sys:String x:Key="VlessQuicType">VLESS QUIC僞裝</sys:String>
     <sys:String x:Key="VlessRPCName">gRPC路徑</sys:String>
     <sys:String x:Key="VlessRPCPort">gRPC端口</sys:String>
     <sys:String x:Key="VmessWsPath">VMESS WS路徑</sys:String>
     <sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
     <sys:String x:Key="VmessKcpType">VMESS KCP偽裝</sys:String>
     <sys:String x:Key="VmessKcpPort">VMESS KCP端口</sys:String>
+    <sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
+    <sys:String x:Key="VmessQuicPort">VMESS QUIC端口</sys:String>
+    <sys:String x:Key="VmessQuicSecurity">VMESS QUIC加密</sys:String>
+    <sys:String x:Key="VmessQuicType">VMESS QUIC僞裝</sys:String>
     <sys:String x:Key="SSPassword">SS密碼</sys:String>
     <sys:String x:Key="SSMethods">SS加密方式</sys:String>
     <sys:String x:Key="SSPort">SS端口</sys:String>
     <sys:String x:Key="TrojanPassword">Trojan密碼</sys:String>
     <sys:String x:Key="TrojanPort">Trojan端口</sys:String>
-    <sys:String x:Key="XrayPort">xray端口</sys:String>
+    <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
+    <sys:String x:Key="XrayPort">XRAY端口</sys:String>
     <sys:String x:Key="XrayPortDefault">默認端口443，不建議修改</sys:String>
+    <sys:String x:Key="MoreParameters">更多參數</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">一鍵安裝</sys:String>
@@ -132,4 +154,13 @@
     <sys:String x:Key="MTProtoPort">端口</sys:String>
     <sys:String x:Key="MTProtoCleartext">加密前字符</sys:String>
     <sys:String x:Key="MTProtoSecretText">密鑰</sys:String>
+    
+    <!--Hysteria-->
+    <sys:String x:Key="HysteriaDomain">域名</sys:String>
+    <sys:String x:Key="HysteriaPort">端口</sys:String>
+    <sys:String x:Key="HysteriaObfs">加密字符</sys:String>
+    <sys:String x:Key="HysteriaEmail">郵箱</sys:String>
+    <sys:String x:Key="HysteriaProtocol">協議</sys:String>
+    <sys:String x:Key="HysteriaUpMbps">上傳限速</sys:String>
+    <sys:String x:Key="HysteriaDownMbps">下載限速</sys:String>
 </ResourceDictionary>

ProxySuper.WPF/Resources/Languages/zh_cn.xaml

@@ -22,6 +22,8 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">فارسی</sys:String>
+    
     <sys:String x:Key="MainMenuHelper">帮助</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
     <sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>
@@ -54,6 +56,7 @@
     <sys:String x:Key="HostUploadSecretKey">上传Key</sys:String>
     <sys:String x:Key="HostSertTypePassword">密码</sys:String>
     <sys:String x:Key="HostSertTypePrivateKey">私钥</sys:String>
+    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私钥密码</sys:String>
 
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@@ -65,15 +68,22 @@
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
 
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">节点类型</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">节点参数</sys:String>
+
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS Over TCP With XTLS&#x0a;性能数倍，首选方式。</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;仍推荐XTLS。</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;推荐，支持CDN。</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;游戏推荐，延迟低，免域名。</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;推荐，支持CDN。</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;游戏推荐，延迟低，免域名。</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;SS，支持udp，免域名。</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan。</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
+    <sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
+    <sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
 
     <sys:String x:Key="XrayDomain">域名/IP</sys:String>
@@ -81,25 +91,37 @@
     <sys:String x:Key="XrayWithTLS">自动申请证书</sys:String>
     <sys:String x:Key="XrayWithTLSDesc">如上传自有证书，则取消对勾。</sys:String>
     <sys:String x:Key="XrayUUID">UUID</sys:String>
+    <sys:String x:Key="Flow">流控</sys:String>
+    <sys:String x:Key="UTLS">uTLS</sys:String>
     <sys:String x:Key="MultiUser">多用户</sys:String>
     <sys:String x:Key="MultiUserHelp">多个UUID用“,”分隔</sys:String>
     <sys:String x:Key="VlessWsPath">VLESS WS路径</sys:String>
     <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
     <sys:String x:Key="VlessKcpType">VLESS KCP伪装</sys:String>
     <sys:String x:Key="VlessKcpPort">VLESS KCP端口</sys:String>
+    <sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
+    <sys:String x:Key="VlessQuicPort">VLESS QUIC端口</sys:String>
+    <sys:String x:Key="VlessQuicSecurity">VLESS QUIC加密</sys:String>
+    <sys:String x:Key="VlessQuicType">VLESS QUIC伪装</sys:String>
     <sys:String x:Key="VlessRPCName">gRPC路径</sys:String>
     <sys:String x:Key="VlessRPCPort">gRPC端口</sys:String>
     <sys:String x:Key="VmessWsPath">VMESS WS路径</sys:String>
     <sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
     <sys:String x:Key="VmessKcpType">VMESS KCP伪装</sys:String>
     <sys:String x:Key="VmessKcpPort">VMESS KCP端口</sys:String>
+    <sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
+    <sys:String x:Key="VmessQuicPort">VMESS QUIC端口</sys:String>
+    <sys:String x:Key="VmessQuicSecurity">VMESS QUIC加密</sys:String>
+    <sys:String x:Key="VmessQuicType">VMESS QUIC伪装</sys:String>
     <sys:String x:Key="SSPassword">SS密码</sys:String>
     <sys:String x:Key="SSMethods">SS加密方式</sys:String>
     <sys:String x:Key="SSPort">SS端口</sys:String>
     <sys:String x:Key="TrojanPassword">Trojan密码</sys:String>
     <sys:String x:Key="TrojanPort">Trojan端口</sys:String>
-    <sys:String x:Key="XrayPort">xray端口</sys:String>
+    <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
+    <sys:String x:Key="XrayPort">XRAY端口</sys:String>
     <sys:String x:Key="XrayPortDefault">默认端口443，不建议修改</sys:String>
+    <sys:String x:Key="MoreParameters">更多参数</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">一键安装</sys:String>
@@ -132,5 +154,14 @@
     <sys:String x:Key="MTProtoDomain">域名/IP</sys:String>
     <sys:String x:Key="MTProtoPort">端口</sys:String>
     <sys:String x:Key="MTProtoCleartext">加密前字符</sys:String>
-    <sys:String x:Key="MTProtoSecretText">密钥</sys:String> 
+    <sys:String x:Key="MTProtoSecretText">密钥</sys:String>
+
+    <!--Hysteria-->
+    <sys:String x:Key="HysteriaDomain">域名</sys:String>
+    <sys:String x:Key="HysteriaPort">端口</sys:String>
+    <sys:String x:Key="HysteriaObfs">加密字符</sys:String>
+    <sys:String x:Key="HysteriaProtocol">协议</sys:String>
+    <sys:String x:Key="HysteriaEmail">邮箱</sys:String>
+    <sys:String x:Key="HysteriaUpMbps">上传限速</sys:String>
+    <sys:String x:Key="HysteriaDownMbps">下载限速</sys:String>
 </ResourceDictionary>

ProxySuper.WPF/Setup.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Logging;
+using MvvmCross.Platforms.Wpf.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProxySuper.WPF
+{
+    public class Setup : MvxWpfSetup<Core.App>
+    {
+        protected override ILoggerProvider CreateLogProvider()
+        {
+            return null;
+        }
+
+        protected override ILoggerFactory CreateLogFactory()
+        {
+            return null;
+        }
+    }
+}

ProxySuper.WPF/Templates/Hysteria/config.json

@@ -0,0 +1,10 @@
+{
+  "listen": ":36712",
+  "acme": {
+    "domains": [
+      "your.domain.com"
+    ],
+    "email": "your@email.com"
+  },
+  "obfs": "8ZuA2Zpqhuk8yakXvMjDqEXBwY"
+}

ProxySuper.WPF/Templates/v2ray/server/05_inbounds/VLESS_QUIC.json

@@ -0,0 +1,31 @@
+{
+  "port": 2000,
+  "protocol": "vless",
+  "settings": {
+    "clients": [
+      {
+        "id": ""
+      }
+    ],
+    "decryption": "none"
+  },
+  "streamSettings": {
+    "network": "quic",
+    "quicSettings": {
+      "security": "none",
+      "key": "",
+      "header": {
+        "type": "none"
+      }
+    },
+    "security": "tls",
+    "tlsSettings": {
+      "certificates": [
+        {
+          "certificateFile": "/usr/local/etc/v2ray/ssl/v2ray_ssl.crt",
+          "keyFile": "/usr/local/etc/v2ray/ssl/v2ray_ssl.key"
+        }
+      ]
+    }
+  }
+}

ProxySuper.WPF/Templates/v2ray/server/05_inbounds/VMESS_QUIC.json

@@ -0,0 +1,31 @@
+{
+  "port": 3000,
+  "protocol": "vmess",
+  "settings": {
+    "clients": [
+      {
+        "id": ""
+      }
+    ],
+    "decryption": "none"
+  },
+  "streamSettings": {
+    "network": "quic",
+    "quicSettings": {
+      "security": "none",
+      "key": "",
+      "header": {
+        "type": "none"
+      }
+    },
+    "security": "tls",
+    "tlsSettings": {
+      "certificates": [
+        {
+          "certificateFile": "/usr/local/etc/v2ray/ssl/v2ray_ssl.crt",
+          "keyFile": "/usr/local/etc/v2ray/ssl/v2ray_ssl.key"
+        }
+      ]
+    }
+  }
+}

ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_QUIC.json

@@ -0,0 +1,31 @@
+{
+  "port": 2000,
+  "protocol": "vless",
+  "settings": {
+    "clients": [
+      {
+        "id": ""
+      }
+    ],
+    "decryption": "none"
+  },
+  "streamSettings": {
+    "network": "quic",
+    "quicSettings": {
+      "security": "none",
+      "key": "",
+      "header": {
+        "type": "none"
+      }
+    },
+    "security": "tls",
+    "tlsSettings": {
+      "certificates": [
+        {
+          "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
+          "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
+        }
+      ]
+    }
+  }
+}

ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json

@@ -5,7 +5,7 @@
     "clients": [
       {
         "id": "",
-        "flow": "xtls-rprx-direct"
+        "flow": "xtls-rprx-vision"
       }
     ],
     "decryption": "none",
@@ -13,15 +13,13 @@
   },
   "streamSettings": {
     "network": "tcp",
-    "security": "xtls",
-    "xtlsSettings": {
-      "allowInsecure": false,
+    "security": "tls",
+    "tlsSettings": {
+      "rejectUnknownSni": true,
       "minVersion": "1.2",
-      "alpn": [
-        "http/1.1"
-      ],
       "certificates": [
         {
+          "ocspStapling": 3600,
           "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
           "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
         }

ProxySuper.WPF/Templates/xray/server/05_inbounds/VMESS_QUIC.json

@@ -0,0 +1,31 @@
+{
+  "port": 3000,
+  "protocol": "vmess",
+  "settings": {
+    "clients": [
+      {
+        "id": ""
+      }
+    ],
+    "decryption": "none"
+  },
+  "streamSettings": {
+    "network": "quic",
+    "quicSettings": {
+      "security": "none",
+      "key": "",
+      "header": {
+        "type": "none"
+      }
+    },
+    "security": "tls",
+    "tlsSettings": {
+      "certificates": [
+        {
+          "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
+          "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
+        }
+      ]
+    }
+  }
+}

ProxySuper.WPF/Views/Brook/BrookConfigView.xaml.cs

@@ -1,10 +1,9 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// BrookConfigView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class BrookConfigView : MvxWindow
     {
         public BrookConfigView()

ProxySuper.WPF/Views/Brook/BrookEditorView.xaml

@@ -11,7 +11,7 @@
         BorderBrush="#eee"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="BrookEditorView" Height="600" Width="1000">
+        Title="BrookEditorView" Height="640" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -24,61 +24,60 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid Margin="10">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
+        <Grid Grid.Column="2" Margin="10,10,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-                <Label Content="类型" Grid.Row="0" Grid.Column="0" />
-                <ComboBox Width="200" 
-                          Height="24"
-                          Grid.Row="0"
-                          Grid.Column="1"
-                          ItemsSource="{Binding Path=BrookTypes}"
-                          SelectedValue="{Binding CheckedBrookType,Mode=TwoWay}">
-                </ComboBox>
+            <Label Content="类型" Grid.Row="0" Grid.Column="0" />
+            <ComboBox Width="200" 
+                        Height="24"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        ItemsSource="{Binding Path=BrookTypes}"
+                        SelectedValue="{Binding CheckedBrookType,Mode=TwoWay}">
+            </ComboBox>
 
-                <Label Content="端口" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding EnablePort}" />
-                <TextBox IsEnabled="{Binding EnablePort}" Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+            <Label Content="端口" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding EnablePort}" />
+            <TextBox IsEnabled="{Binding EnablePort}" Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="密码" Grid.Row="2" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
+            <Label Content="密码" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
 
-                <Label Content="IP" Grid.Row="3" Grid.Column="0" IsEnabled="{Binding EnableIP}" />
-                <TextBox IsEnabled="{Binding EnableIP}" Text="{Binding Settings.IP}" Grid.Row="3" Grid.Column="1" />
+            <Label Content="IP" Grid.Row="3" Grid.Column="0" IsEnabled="{Binding EnableIP}" />
+            <TextBox IsEnabled="{Binding EnableIP}" Text="{Binding Settings.IP}" Grid.Row="3" Grid.Column="1" />
 
-                <Label Content="域名" Grid.Row="4" Grid.Column="0" IsEnabled="{Binding EnableDomain}" />
-                <TextBox IsEnabled="{Binding EnableDomain}" Text="{Binding Settings.Domain}" Grid.Row="4" Grid.Column="1" />
-            </Grid>
+            <Label Content="域名" Grid.Row="4" Grid.Column="0" IsEnabled="{Binding EnableDomain}" />
+            <TextBox IsEnabled="{Binding EnableDomain}" Text="{Binding Settings.Domain}" Grid.Row="4" Grid.Column="1" />
 
-            <Border BorderBrush="#eee" BorderThickness="0,1,0,0">
+            <Border Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#eee" BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            HorizontalAlignment="Right"
-                            Margin="0,20,0,0">
+                            HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
-                            Command="{Binding SaveCommand}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Padding="10,5" />
+                        Command="{Binding SaveCommand}"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Padding="10,5" />
 
                     <Button Content="{DynamicResource SaveAndInstall}"
-                            Command="{Binding SaveAndInstallCommand}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Padding="10,5"
-                            Margin="20,0,40,0" />
+                        Command="{Binding SaveAndInstallCommand}"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Padding="10,5"
+                        Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/Brook/BrookEditorView.xaml.cs

@@ -3,10 +3,7 @@ using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// BrookEditorView.xaml 的交互逻辑
-    /// </summary>
-    [MvxWindowPresentation(Identifier = nameof(XrayEditorView), Modal = false)]
+    [MvxWindowPresentation]
     public partial class BrookEditorView : MvxWindow
     {
         public BrookEditorView()

ProxySuper.WPF/Views/Brook/BrookInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.Brook
 {
-    /// <summary>
-    /// BrookInstallView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class BrookInstallView : MvxWindow
     {
         public BrookInstallView()

ProxySuper.WPF/Views/EnableRootView.xaml.cs

@@ -1,10 +1,9 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// EnableRootView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class EnableRootView : MvxWindow
     {
         public EnableRootView()

ProxySuper.WPF/Views/HomeView.xaml

@@ -21,6 +21,7 @@
                 <MenuItem Padding="0,5" Header="Trojan-Go" Command="{Binding AddTrojanGoCommand}"></MenuItem>
                 <MenuItem Padding="0,5" Header="NaiveProxy" Command="{Binding AddNaiveProxyCommand}"></MenuItem>
                 <MenuItem Padding="0,5" Header="Brook" Command="{Binding AddBrookCommand}"></MenuItem>
+                <MenuItem Padding="0,5" Header="Hysteria" Command="{Binding AddHysteriaCommand}"></MenuItem>
             </MenuItem>
 
             <MenuItem Header="{DynamicResource MainMenuActions}" Padding="10,3">
@@ -32,6 +33,7 @@
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageEn}" Click="SetEnglish"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageTw}" Click="SetTwCN"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageCn}" Click="SetSimpleChinese"></MenuItem>
+                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageFr}" Click="SetIrFA"></MenuItem>
             </MenuItem>
 
             <MenuItem Header="{DynamicResource MainMenuHelper}" Padding="10,3">
@@ -85,7 +87,10 @@
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
 
-                    <DataGridTemplateColumn Header="{DynamicResource MainDataGridColumnAction}" Width="400">
+                    <DataGridTemplateColumn  Width="400">
+                        <DataGridTemplateColumn.Header>
+                            <TextBlock Text="{DynamicResource MainDataGridColumnAction}" />
+                        </DataGridTemplateColumn.Header>
                         <DataGridTemplateColumn.CellTemplate>
                             <ItemContainerTemplate>
                                 <StackPanel Orientation="Horizontal">

ProxySuper.WPF/Views/HomeView.xaml.cs

@@ -1,6 +1,8 @@
 using MvvmCross;
 using MvvmCross.Navigation;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.ViewModels;
 using ProxySuper.Core.Models;
 using ProxySuper.Core.ViewModels;
 using System;
@@ -10,9 +12,8 @@ using System.Windows;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// HomeView.xaml 的交互逻辑
-    /// </summary>
+    [MvxContentPresentation]
+    [MvxViewFor(typeof(HomeViewModel))]
     public partial class HomeView : MvxWpfView
     {
 
@@ -68,7 +69,11 @@ namespace ProxySuper.WPF.Views
             resource.Source = new Uri(@"Resources\Languages\zh_cn.xaml", UriKind.Relative);
             Application.Current.Resources.MergedDictionaries[0] = resource;
         }
-
+        private void SetIrFA(object sender, RoutedEventArgs e)
+        {
+            resource.Source = new Uri(@"Resources\Languages\fa_IR.xaml", UriKind.Relative);
+            Application.Current.Resources.MergedDictionaries[0] = resource;
+        }
         private void SetEnglish(object sender, RoutedEventArgs e)
         {
             resource.Source = new Uri(@"Resources\Languages\en.xaml", UriKind.Relative);

ProxySuper.WPF/Views/Hysteria/HysteriaConfigView.xaml

@@ -0,0 +1,14 @@
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.Hysteria.HysteriaConfigView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ProxySuper.WPF.Views.Hysteria"
+        xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
+        mc:Ignorable="d"
+        WindowStartupLocation="CenterScreen"
+        Title="Hysteria配置" Height="450" Width="800">
+    <StackPanel Margin="20">
+        <TextBox Height="360" Text="{Binding ClientJson, Mode=OneWay}" IsReadOnly="True" />
+    </StackPanel>
+</views:MvxWindow>

ProxySuper.WPF/Views/Hysteria/HysteriaConfigView.xaml.cs

@@ -0,0 +1,30 @@
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ProxySuper.WPF.Views.Hysteria
+{
+    /// <summary>
+    /// HysteriaConfigView.xaml 的交互逻辑
+    /// </summary>
+    [MvxWindowPresentation]
+    public partial class HysteriaConfigView : MvxWindow
+    {
+        public HysteriaConfigView()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml

@@ -0,0 +1,88 @@
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.Hysteria.HysteriaEditorView"
+        xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ProxySuper.WPF.Views.Hysteria" 
+        xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
+        mc:Ignorable="d"
+        BorderThickness="0,1,0,0"
+        BorderBrush="#eee"
+        Icon="/Resources/ProxySU.ico"
+        WindowStartupLocation="CenterScreen"
+        Title="Hysteria编辑配置" Height="640" Width="1000">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="310" />
+            <ColumnDefinition Width="1" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <StackPanel Grid.Column="0" Margin="10">
+            <ctrl:HostControl />
+        </StackPanel>
+        <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
+
+        <Grid Grid.Column="2" Margin="10,10,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Content="{DynamicResource HysteriaDomain}" Grid.Row="0" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
+
+            <Label Content="{DynamicResource HysteriaPort}" Grid.Row="1" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+
+            <Label Content="{DynamicResource HysteriaObfs}" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Obfs}" Grid.Row="2" Grid.Column="1" />
+
+            <Label Content="{DynamicResource HysteriaEmail}" Grid.Row="3" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Email}" Grid.Row="3" Grid.Column="1" />
+
+            <!--<Label Content="{DynamicResource HysteriaProtocol}" Grid.Row="4" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Protocol}" Grid.Row="4" Grid.Column="1" />-->
+
+            <!--<Label Content="{DynamicResource HysteriaUpMbps}" Grid.Row="5" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.UpMbps}" Grid.Row="5" Grid.Column="1" />
+
+            <Label Content="{DynamicResource HysteriaDownMbps}" Grid.Row="6" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.DownMbps}" Grid.Row="6" Grid.Column="1" />-->
+            
+            <Border Grid.Row="8"
+                    Grid.ColumnSpan="3"
+                    BorderBrush="#eee"
+                    BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" 
+                            HorizontalAlignment="Right">
+                    <Button Content="{DynamicResource Save}" 
+                            Command="{Binding SaveCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5" />
+
+                    <Button Content="{DynamicResource SaveAndInstall}"
+                            Command="{Binding SaveAndInstallCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5"
+                            Margin="20,0,40,0" />
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</views:MvxWindow>

ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml.cs

@@ -0,0 +1,29 @@
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ProxySuper.WPF.Views.Hysteria
+{
+    [MvxWindowPresentation]
+    public partial class HysteriaEditorView : MvxWindow
+    {
+        public HysteriaEditorView()
+        {
+            InitializeComponent();
+        }
+
+
+    }
+}

ProxySuper.WPF/Views/Hysteria/HysteriaInstallView.xaml

@@ -0,0 +1,34 @@
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.Hysteria.HysteriaInstallView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ProxySuper.WPF.Views.Hysteria"
+        xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
+        xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
+        mc:Ignorable="d"
+        WindowStartupLocation="CenterScreen"
+        Title="Hysteria安装" Height="450" Width="800">
+    <StackPanel>
+        <ctrl:ProgressControl />
+
+        <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
+            <Label Content="{DynamicResource Install}" FontWeight="Bold" FontSize="14" />
+
+            <Button Content="{DynamicResource XrayInstallerInstall}" 
+                    Command="{Binding Path=InstallCommand}" 
+                    Padding="10,3" 
+                    Margin="10,0,0,0" />
+
+            <!--<Button Content="{DynamicResource XrayInstallerUpdateSettings}"
+                    Command="{Binding Path=UpdateSettingsCommand}"
+                    Padding="10,3" 
+                    Margin="10,0,0,0" />-->
+
+            <Button Content="{DynamicResource XrayInstallerUninstall}" 
+                    Command="{Binding Path=UninstallCommand}"
+                    Padding="10,3" 
+                    Margin="10,0,0,0" />
+        </StackPanel>
+    </StackPanel>
+</views:MvxWindow>

ProxySuper.WPF/Views/Hysteria/HysteriaInstallView.xaml.cs

@@ -0,0 +1,30 @@
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ProxySuper.WPF.Views.Hysteria
+{
+    /// <summary>
+    /// HysteriaInstallView.xaml 的交互逻辑
+    /// </summary>
+    [MvxWindowPresentation]
+    public partial class HysteriaInstallView : MvxWindow
+    {
+        public HysteriaInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Views/MTProxyGo/MTProxyGoConfigView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.MTProtoGo
 {
-    /// <summary>
-    /// MTProtoGoConfigView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class MTProtoGoConfigView : MvxWindow
     {
         public MTProtoGoConfigView()

ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml

@@ -11,7 +11,7 @@
         BorderBrush="#eee"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="MTProto-Go编辑配置" Height="600" Width="1000">
+        Title="MTProto-Go编辑配置" Height="640" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -24,49 +24,50 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid Margin="10">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
+        <Grid Grid.Column="2" Margin="10,10,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-                <Label Content="{DynamicResource MTProtoDomain}" Grid.Row="0" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
+            <Label Content="{DynamicResource MTProtoDomain}" Grid.Row="0" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
 
-                <Label Content="{DynamicResource MTProtoPort}" Grid.Row="1" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+            <Label Content="{DynamicResource MTProtoPort}" Grid.Row="1" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="{DynamicResource MTProtoCleartext}" Grid.Row="2" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Cleartext}" Grid.Row="2" Grid.Column="1" />
-            </Grid>
+            <Label Content="{DynamicResource MTProtoCleartext}" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Cleartext}" Grid.Row="2" Grid.Column="1" />
 
 
-            <Border Grid.Row="1"
+            <Border Grid.Row="4"
+                    Grid.ColumnSpan="3"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            Margin="0,20,0,0"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
-                            Command="{Binding SaveCommand}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Padding="10,5" />
+                                Command="{Binding SaveCommand}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Padding="10,5" />
 
                     <Button Content="{DynamicResource SaveAndInstall}"
-                            Command="{Binding SaveAndInstallCommand}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Padding="10,5"
-                            Margin="20,0,40,0" />
+                                Command="{Binding SaveAndInstallCommand}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Padding="10,5"
+                                Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.MTProtoGo
 {
-    /// <summary>
-    /// MTProtoGoEditorView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class MTProtoGoEditorView : MvxWindow
     {
         public MTProtoGoEditorView()

ProxySuper.WPF/Views/MTProxyGo/MTProxyGoInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.MTProtoGo
 {
-    /// <summary>
-    /// MTProtoInstallView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class MTProtoGoInstallView : MvxWindow
     {
         public MTProtoGoInstallView()

ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs

@@ -1,10 +1,9 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// NaiveProxyConfigView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class NaiveProxyConfigView : MvxWindow
     {
         public NaiveProxyConfigView()

ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml

@@ -11,7 +11,7 @@
         BorderBrush="#eee"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="NaiveProxy编辑配置" Height="600" Width="1000">
+        Title="NaiveProxy编辑配置" Height="640" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -22,42 +22,43 @@
         <StackPanel Grid.Column="0" Margin="10">
             <ctrl:HostControl />
         </StackPanel>
+
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid Margin="10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                </Grid.RowDefinitions>
+        <Grid Grid.Column="2" Margin="10,10,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
 
-                <Label Content="{DynamicResource NaiveProxyDomain}" Grid.Row="0" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
+            <Label Content="{DynamicResource NaiveProxyDomain}" Grid.Row="0" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
 
-                <Label Content="{DynamicResource NaiveProxyPort}" Grid.Row="1" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+            <Label Content="{DynamicResource NaiveProxyPort}" Grid.Row="1" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="{DynamicResource NaiveProxyUserName}" Grid.Row="2" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.UserName}" Grid.Row="2" Grid.Column="1" />
+            <Label Content="{DynamicResource NaiveProxyUserName}" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.UserName}" Grid.Row="2" Grid.Column="1" />
 
-                <Label Content="{DynamicResource NaiveProxyPassword}" Grid.Row="3" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Password}" Grid.Row="3" Grid.Column="1" />
+            <Label Content="{DynamicResource NaiveProxyPassword}" Grid.Row="3" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Password}" Grid.Row="3" Grid.Column="1" />
 
-                <Label Content="{DynamicResource NaiveProxyMaskDomain}" Grid.Row="4" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="4" Grid.Column="1" />
-            </Grid>
+            <Label Content="{DynamicResource NaiveProxyMaskDomain}" Grid.Row="4" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="4" Grid.Column="1" />
 
-            <Border BorderBrush="#eee" BorderThickness="0,1,0,0">
+            <Border Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#eee" BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            HorizontalAlignment="Right"
-                            Margin="0,20,0,0">
+                            HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
                             HorizontalAlignment="Right"
@@ -72,6 +73,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs

@@ -1,10 +1,9 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// NaiveProxyEditorView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class NaiveProxyEditorView : MvxWindow
     {
         public NaiveProxyEditorView()

ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.NaiveProxy
 {
-    /// <summary>
-    /// NaiveProxyInstallViewModel.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class NaiveProxyInstallView : MvxWindow
     {
         public NaiveProxyInstallView()

ProxySuper.WPF/Views/ShareLinkView.xaml.cs

@@ -1,10 +1,9 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// ShareLinkView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class ShareLinkView : MvxWindow
     {
         public ShareLinkView()

ProxySuper.WPF/Views/TrojanGo/TrojanGoConfigView.xaml.cs

@@ -1,11 +1,10 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.ViewModels;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// TrojanGoConfigView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class TrojanGoConfigView : MvxWindow
     {
         public TrojanGoConfigView()

ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml

@@ -11,7 +11,7 @@
         BorderBrush="#eee"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="Trojan-Go编辑配置" Height="600" Width="1000">
+        Title="Trojan-Go编辑配置" Height="640" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -23,54 +23,53 @@
             <ctrl:HostControl />
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
+ 
+        <Grid Margin="10,10,0,0" Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-        <StackPanel Grid.Column="2">
-            <Grid Margin="10">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
+            <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoPort}" Grid.Row="1" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoPort}" Grid.Row="1" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoPassword}" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoPassword}" Grid.Row="2" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoMaskDomain}" Grid.Row="3" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="3" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoMaskDomain}" Grid.Row="3" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="3" Grid.Column="1" />
-
-                <Label Content="{DynamicResource TrojanGoWebSocketPath}" Grid.Row="4" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.WebSocketPath}" Grid.Row="4" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoWebSocketPath}" Grid.Row="4" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.WebSocketPath}" Grid.Row="4" Grid.Column="1" />
 
 
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" Grid.Row="5" Grid.Column="0" />
-                <CheckBox IsChecked="{Binding Path=Settings.WithTLS}" 
-                          Grid.Row="5"
-                          Grid.Column="1"
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </Grid>
+            <Label Content="{DynamicResource XrayWithTLS}" Width="120" Grid.Row="5" Grid.Column="0" />
+            <CheckBox IsChecked="{Binding Path=Settings.WithTLS}" 
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Content="{DynamicResource XrayWithTLSDesc}"
+                        VerticalContentAlignment="Center"
+                        VerticalAlignment="Center" />
 
-
-            <Border Grid.Row="1"
+            <Border Grid.Row="7"
+                    Grid.ColumnSpan="3"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            Margin="0,20,0,0"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
@@ -86,6 +85,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml.cs

@@ -3,10 +3,7 @@ using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// TrojanEditorView.xaml 的交互逻辑
-    /// </summary>
-    [MvxWindowPresentation(Identifier = nameof(TrojanGoEditorView), Modal = false)]
+    [MvxWindowPresentation]
     public partial class TrojanGoEditorView : MvxWindow
     {
         public TrojanGoEditorView()

ProxySuper.WPF/Views/TrojanGo/TrojanGoInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.TrojanGo
 {
-    /// <summary>
-    /// TrojanGoInstallView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class TrojanGoInstallView : MvxWindow
     {
         public TrojanGoInstallView()

ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml

@@ -45,6 +45,13 @@
                 <ctrl:VLESS_KCP_Control />
             </TabItem>
 
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:RayType.VLESS_QUIC}"
+                     IsEnabled="{Binding Checked_VLESS_QUIC}"
+                     Header="VLESS-QUIC">
+                <ctrl:VLESS_QUIC_Control />
+            </TabItem>
+
             <TabItem Width="200" Height="40"
                      Tag="{x:Static models:RayType.VLESS_gRPC}"
                      IsEnabled="{Binding Checked_VLESS_gRPC}"                     
@@ -73,6 +80,13 @@
                 <ctrl:VMESS_KCP_Control />
             </TabItem>
 
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:RayType.VMESS_QUIC}"
+                     IsEnabled="{Binding Checked_VLESS_QUIC}"
+                     Header="VMESS-QUIC">
+                <ctrl:VMESS_QUIC_Control />
+            </TabItem>
+
             <TabItem Width="200" Height="40"     
                      Tag="{x:Static models:RayType.Trojan_TCP}"
                      IsEnabled="{Binding Checked_Trojan_TCP}"

ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -21,9 +22,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.V2ray
 {
-    /// <summary>
-    /// V2rayConfigView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class V2rayConfigView : MvxWindow
     {
         public V2rayConfigView()

ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml

@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="V2ray编辑配置" Height="610" Width="1015">
+        Title="V2ray编辑配置" Height="640" Width="1015">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -25,41 +25,39 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="500" />
-                    <RowDefinition Height="80" />
-                </Grid.RowDefinitions>
+        <Grid Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
 
-                <ScrollViewer Name="scroll" 
-                              Padding="10" 
-                              Height="500"
-                              Grid.Row="0"
-                              HorizontalScrollBarVisibility="Auto" 
-                              VerticalScrollBarVisibility="Auto" >
-                    <ctrl:V2raySettingsControl />
-                </ScrollViewer>
+            <ScrollViewer Name="scroll" 
+                            Padding="10" 
+                            Height="auto"
+                            Grid.Row="0"
+                            HorizontalScrollBarVisibility="Auto" 
+                            VerticalScrollBarVisibility="Auto" >
+                <ctrl:V2raySettingsControl />
+            </ScrollViewer>
 
-                <Border Grid.Row="1"
-                        BorderBrush="#eee"
-                        BorderThickness="0,1,0,0">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button Content="{DynamicResource Save}" 
-                                Command="{Binding SaveCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5" />
+            <Border Grid.Row="1"
+                    BorderBrush="#eee"
+                    BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Content="{DynamicResource Save}" 
+                            Command="{Binding SaveCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5" />
 
-                        <Button Content="{DynamicResource SaveAndInstall}"
-                                Command="{Binding SaveAndInstallCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5"
-                                Margin="20,0,40,0" />
-                    </StackPanel>
-                </Border>
-            </Grid>
-        </StackPanel>
+                    <Button Content="{DynamicResource SaveAndInstall}"
+                            Command="{Binding SaveAndInstallCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5"
+                            Margin="20,0,40,0" />
+                </StackPanel>
+            </Border>
+        </Grid> 
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.V2ray
 {
-    /// <summary>
-    /// V2rayEditorView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class V2rayEditorView : MvxWindow
     {
         public V2rayEditorView()

ProxySuper.WPF/Views/V2ray/V2rayInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,9 +16,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.V2ray
 {
-    /// <summary>
-    /// V2rayInstallView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class V2rayInstallView : MvxWindow
     {
         public V2rayInstallView()

ProxySuper.WPF/Views/Xray/XrayConfigView.xaml

@@ -52,6 +52,13 @@
                 <ctrl:VLESS_KCP_Control />
             </TabItem>
 
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:RayType.VLESS_QUIC}"
+                     IsEnabled="{Binding Checked_VLESS_QUIC}"
+                     Header="VLESS-QUIC">
+                <ctrl:VLESS_QUIC_Control />
+            </TabItem>
+
             <TabItem Width="200" Height="40"
                      Tag="{x:Static models:RayType.VLESS_gRPC}"
                      IsEnabled="{Binding Checked_VLESS_gRPC}"                     
@@ -59,13 +66,6 @@
                 <ctrl:VLESS_gRPC_Control />
             </TabItem>
 
-            <!--<TabItem Width="200" Height="40"     
-                     Tag="{x:Static models:XrayType.VMESS_TCP}"                 
-                     IsEnabled="{Binding Checked_VMESS_TCP}"
-                     Header="VMESS-TCP-TLS">
-                <ctrl:VMESS_TCP_TLS_Control />
-            </TabItem>-->
-
             <TabItem Width="200" Height="40"     
                      Tag="{x:Static models:RayType.VMESS_WS}"
                      IsEnabled="{Binding Checked_VMESS_WS}"
@@ -80,6 +80,13 @@
                 <ctrl:VMESS_KCP_Control />
             </TabItem>
 
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:RayType.VMESS_QUIC}"
+                     IsEnabled="{Binding Checked_VLESS_QUIC}"
+                     Header="VMESS-QUIC">
+                <ctrl:VMESS_QUIC_Control />
+            </TabItem>
+
             <TabItem Width="200" Height="40"     
                      Tag="{x:Static models:RayType.Trojan_TCP}"
                      IsEnabled="{Binding Checked_Trojan_TCP}"

ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -12,9 +13,7 @@ using System.Windows.Media.Imaging;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// XrayInfoView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class XrayConfigView : MvxWindow
     {
         public XrayConfigView()
@@ -89,6 +88,9 @@ namespace ProxySuper.WPF.Views
                 case RayType.VLESS_KCP:
                     shareLink = Settings.VLESS_KCP_ShareLink;
                     break;
+                case RayType.VLESS_QUIC:
+                    shareLink = Settings.VLESS_QUIC_ShareLink;
+                    break;
                 case RayType.VLESS_gRPC:
                     shareLink = Settings.VLESS_gRPC_ShareLink;
                     break;
@@ -103,6 +105,9 @@ namespace ProxySuper.WPF.Views
                 case RayType.VMESS_KCP:
                     shareLink = Settings.VMESS_KCP_ShareLink;
                     break;
+                case RayType.VMESS_QUIC:
+                    shareLink = Settings.VMESS_QUIC_ShareLink;
+                    break;
                 case RayType.Trojan_TCP:
                     shareLink = Settings.Trojan_TCP_ShareLink;
                     break;
@@ -116,16 +121,16 @@ namespace ProxySuper.WPF.Views
             }
 
 
-            QRCodeGenerator qrGenerator = new QRCodeGenerator();
-            QRCodeData qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
-            QRCode qrCode = new QRCode(qrCodeData);
+            var qrGenerator = new QRCodeGenerator();
+            var qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
+            var qrCode = new QRCode(qrCodeData);
 
-            Bitmap qrCodeImage = qrCode.GetGraphic(20);
-            MemoryStream ms = new MemoryStream();
+            var qrCodeImage = qrCode.GetGraphic(20);
+            var ms = new MemoryStream();
             qrCodeImage.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
             byte[] bytes = ms.GetBuffer();
             ms.Close();
-            BitmapImage image = new BitmapImage();
+            var image = new BitmapImage();
             image.BeginInit();
             image.StreamSource = new MemoryStream(bytes);
             image.EndInit();

ProxySuper.WPF/Views/Xray/XrayEditorView.xaml

@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="Xray编辑配置" Height="610" Width="1015">
+        Title="Xray编辑配置" Height="640" Width="1015">
 
     <Grid>
         <Grid.ColumnDefinitions>
@@ -26,41 +26,40 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="500" />
-                    <RowDefinition Height="80" />
-                </Grid.RowDefinitions>
+        <Grid Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
 
-                <ScrollViewer Name="scroll" 
-                              Padding="10" 
-                              Height="500"
-                              Grid.Row="0"
-                              HorizontalScrollBarVisibility="Auto" 
-                              VerticalScrollBarVisibility="Auto" >
-                    <ctrl:XraySettingsControl />
-                </ScrollViewer>
+            <ScrollViewer Name="scroll" 
+                          Padding="10"  
+                          Height="auto"
+                          Grid.Row="0"
+                          HorizontalScrollBarVisibility="Auto" 
+                          VerticalScrollBarVisibility="Auto" >
+                <ctrl:XraySettingsControl />
+            </ScrollViewer>
 
-                <Border Grid.Row="1"
-                        BorderBrush="#eee"
-                        BorderThickness="0,1,0,0">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button Content="{DynamicResource Save}" 
-                                Command="{Binding SaveCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5" />
+            <Border Grid.Row="1"
+                    BorderBrush="#eee"
+                    BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Content="{DynamicResource Save}" 
+                            Command="{Binding SaveCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5" />
 
-                        <Button Content="{DynamicResource SaveAndInstall}"
-                                Command="{Binding SaveAndInstallCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5"
-                                Margin="20,0,40,0" />
-                    </StackPanel>
-                </Border>
-            </Grid>
-        </StackPanel>
+                    <Button Content="{DynamicResource SaveAndInstall}"
+                            Command="{Binding SaveAndInstallCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5"
+                            Margin="20,0,40,0" />
+                </StackPanel>
+            </Border>
+
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs

@@ -4,10 +4,7 @@ using System;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// XrayEditorView.xaml 的交互逻辑
-    /// </summary>
-    [MvxWindowPresentation(Identifier = nameof(XrayEditorView), Modal = false)]
+    [MvxWindowPresentation]
     public partial class XrayEditorView : MvxWindow
     {
         public XrayEditorView()

ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using MvvmCross.ViewModels;
 using ProxySuper.Core.ViewModels;
 using System;
@@ -17,9 +18,7 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views
 {
-    /// <summary>
-    /// XrayInstallView.xaml 的交互逻辑
-    /// </summary>
+    [MvxWindowPresentation]
     public partial class XrayInstallView : MvxWindow
     {
         public XrayInstallView()

ProxySuper.WPF/packages.config

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="7.1.2" targetFramework="net461" />
-  <package id="MvvmCross.Platforms.Wpf" version="7.1.2" targetFramework="net461" />
-  <package id="QRCoder" version="1.4.1" targetFramework="net461" />
-  <package id="SSH.NET" version="2020.0.1" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
+  <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
+  <package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" />
+  <package id="QRCoder" version="1.4.3" targetFramework="net472" />
+  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Console" version="4.3.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Runtime.WindowsRuntime" version="4.7.0" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
 </packages>

README.md

@@ -1,10 +1,13 @@
 # ProxySU
 V2ray, Xray, Trojan, NaiveProxy, Trojan-Go, MTProto Go, Brook,BBR install tools for windows。  
 V2ray，Xray, Trojan，NaiveProxy, Trojan-Go, MTProto Go, Brook 及相关插件。支持纯ipv6主机一键安装代理。  
-BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文。
+BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文，波斯语。  
 
 编译环境Visual Studio 2019  使用WPF界面。可一键安装 V2ray/Xray, Shadowsocks, Trojan, Trojan-Go, NaiveProxy, MTProto Go, Brook 后续还会再添加其他。  
 
+零基础用户，强烈建议看一下[Xray官网](https://xtls.github.io)的[小小白白话文-自建教程](https://xtls.github.io/document/level-0)。  
+更多相关资源与工具请看本项目Wiki[资源和工具](https://github.com/proxysu/ProxySU/wiki/%E8%B5%84%E6%BA%90%E5%92%8C%E5%B7%A5%E5%85%B7)。  
+
 ![photo_2021-05-31_17-23-29](https://user-images.githubusercontent.com/73510229/120171754-f46ffd00-c234-11eb-8105-4e6a941a65bb.jpg)
 ![photo_2021-05-31_17-24-29](https://user-images.githubusercontent.com/73510229/120171966-297c4f80-c235-11eb-921a-2ddebad5dc58.jpg)
 
@@ -15,8 +18,9 @@ BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语
 #### 再次声明：  
 ##### ProxySU本着技术中立的原则，没有任何立场，也不持任何见解，更不涉及任何政治因素。ProxySU仅仅主张人的知情权，这是一项天赋人权，也是各国宪法所保障的最基本人权。知情权包含对同一事物正负两方面评价的知情，至于相信哪个，由人自己选择。正如李文亮医生临终所言：一个正常的社会是不应该只有一种声音的。如果真的存在对某一事物只有一种声音的评价，无论其评价是正面还是负面，都是要慎重对待，并需要重新审视的。  
 
-##### 上传自有证书 #####
-需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”
+
+##### 代理版本的选择  
+多数情况下，ProxySU安装代理工具的Latest版。  
 
 ##### 支持的VPS系统为：  
 * CentOS 7/8   
@@ -58,7 +62,14 @@ ProxySU调用[SSH.NET](https://github.com/sshnet/SSH.NET)库登录远程主机
 * RSA in OpenSSL PEM and ssh.com format  
 * DSA in OpenSSL PEM and ssh.com format  
 * ECDSA 256/384/521 in OpenSSL PEM format  
-* ED25519 in OpenSSH key format  
+* ECDSA 256/384/521, ED25519 and RSA in OpenSSH key format  
+可以使用以下密码方法之一对私钥进行加密：  
+* DES-EDE3-CBC  
+* DES-EDE3-CFB  
+* DES-CBC  
+* AES-128-CBC  
+* AES-192-CBC  
+* AES-256-CBC  
 见官方说明：  
 https://github.com/sshnet/SSH.NET#public-key-authentication  
 如果当前拥有的密钥格式不是以上几种，可以下载[puttygen](https://www.puttygen.com/)工具，将其转换成上面的格式。  
@@ -79,6 +90,9 @@ Let's Encrypt证书申请频率的限制
 同一IP地址，在短时间内过于频繁的申请证书，也会被限制，此时更换域名也无法申请成功，只能等待一段时间，或者更换Ip.  
 (网友分享)  
 
+##### 上传自有证书 #####
+需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”
+
 ##### 关于卸载功能  
 有网友要求，可以卸载其他方法安装的，经过考虑，还是不这样做。1，容易引起争议。2，不容易卸载干净，在用ProxySU安装时可能还会出错。所以第一次使用ProxySU建议使用全新系统，如果以前安装过代理程序，请尽可能将系统重装一下，可以减少很多安装的错误和冲突。  
 
@@ -87,8 +101,6 @@ Let's Encrypt证书申请频率的限制
 [(GPL-V3)](https://raw.githubusercontent.com/proxysu/windows/master/LICENSE)
 
 ## 运行文件下载
-* Beta版(随代码更新，新添加功能可能有bug或不完善)  
-[下载](https://github.com/proxysu/windows/raw/master/ProxySU/bin/Beta/Beta.zip)
 * 正式版（正式发布的版本，新功能完善后发布）  
 [下载](https://github.com/proxysu/windows/releases)
 
@@ -106,7 +118,6 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram
 
 ## 程序使用问题反馈  
 * Telegram群组 https://t.me/proxysuissues   
-* Telegram频道 https://t.me/proxysu_channel 
 * 在线提问  https://github.com/proxysu/windows/issues  
 
 在使用遇到问题时，请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError)，如果还不能解决，可以到以上平台询问，个人精力有限，尽力解答。
@@ -114,3 +125,5 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram
 
 
 
+
+