.gitignore

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

FodyWeavers.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-	<Costura />
-</Weavers>

ProxySU.sln

@@ -9,11 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.WPF", "ProxySupe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.Core", "ProxySuper.Core\ProxySuper.Core.csproj", "{15779EE6-D8CA-44BF-BFE2-941E155EEF3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{327FE75A-7D23-4F0E-80E2-7D10C7603969}"
-	ProjectSection(SolutionItems) = preProject
-		FodyWeavers.xml = FodyWeavers.xml
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

ProxySuper.Core/Converters/ProxyTypeConverter.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Windows;
 using System.Windows.Data;
 
 namespace ProxySuper.Core.Converters
@@ -28,19 +26,4 @@ namespace ProxySuper.Core.Converters
             return parameter;
         }
     }
-
-    public class BooleanOrConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return values.OfType<bool>().Any(v => v);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-
 }

ProxySuper.Core/Converters/VisibleConverter.cs

@@ -9,47 +9,22 @@ namespace ProxySuper.Core.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            bool isMatch = (value != null && value.Equals(parameter));
-            // 如果匹配则显示，否则隐藏（Collapsed）
-            return isMatch ? Visibility.Visible : Visibility.Hidden;//Collapsed;
-            //return value.Equals(true) ? Visibility.Visible : Visibility.Hidden;//Collapsed;
+            return value.Equals(true) ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
-            //if (value == null)
-            //{
-            //    return false;
-            //}
-
-            //if (value.Equals(Visibility.Visible))
-            //{
-            //    return true;
-            //}
-
-            //return false;
-        }
+            if (value == null)
+            {
+                return false;
             }
 
-    public class BooleanOrToVisibilityConverter : IMultiValueConverter
+            if (value.Equals(Visibility.Visible))
             {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            // 如果任一条件为 true，则返回 Visible，否则返回 Hidden/Collapsed
-            foreach (var value in values)
-            {
-                if (value is bool boolVal && boolVal)
-                {
-                    return Visibility.Visible;
-                }
-            }
-            return Visibility.Hidden;//Collapsed
+                return true;
             }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
+            return false;
         }
     }
 }

ProxySuper.Core/Models/Hosts/Host.cs

@@ -20,61 +20,36 @@ namespace ProxySuper.Core.Models.Hosts
 
         public string Address { get; set; }
 
-        public int Port { get; set; } = 22;
-
         public string UserName { get; set; }
 
         public string Password { get; set; }
 
-        public string PrivateKeyPath { get; set; }
+        public int Port { get; set; } = 22;
 
-        public string PrivateKeyPassPhrase { get; set; }
+        public string PrivateKeyPath { get; set; }
 
         public LocalProxy Proxy { get; set; }
 
         public LoginSecretType SecretType { get; set; }
 
-        //public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
-        
-        private readonly IMvxCommand _uploadPrivateKeyCommand;
-        public IMvxCommand UploadPrivateKeyCommand => _uploadPrivateKeyCommand ?? new MvxCommand(UploadPrivateKey);
+        public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
 
         private void UploadPrivateKey()
         {
-            var fileDialog = new OpenFileDialog() 
-            {
-                Filter = "Private Key (*.pem;*.key)|*.pem;*.key|All File (*.*)|*.*",
-                Title = "Select the private key file"
-            };
+            var fileDialog = new OpenFileDialog();
             fileDialog.FileOk += OnFileOk;
             fileDialog.ShowDialog();
         }
 
-        private async void OnFileOk(object sender, CancelEventArgs e)
+        private void OnFileOk(object sender, CancelEventArgs e)
         {
             var file = sender as OpenFileDialog;
-            if (file != null)
-            {
             PrivateKeyPath = file.FileName;
 
-                //Task.Delay(300).ContinueWith((t) =>
-                //{
-                //    MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
-                //});
-
-                await Task.Delay(300);
-                MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
-            }
-            else
+            Task.Delay(300).ContinueWith((t) =>
             {
-                //Task.Delay(300).ContinueWith((t) =>
-                //{
-                //    MessageBox.Show("Error:Unable to get file!", "Tips");
-                //});
-
-                await Task.Delay(300);
-                MessageBox.Show("Error:Unable to get file!", "Tips");
-            }
+                MessageBox.Show("上传成功", "提示");
+            });
         }
     }
 }

ProxySuper.Core/Models/Projects/HysteriaSettings.cs

@@ -1,33 +0,0 @@
-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,6 +8,5 @@
         Brook = 3,
         V2ray = 4,
         MTProtoGo = 5,
-        Hysteria = 6,
     }
 }

ProxySuper.Core/Models/Projects/RayType.cs

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

ProxySuper.Core/Models/Projects/V2raySettings.cs

@@ -9,15 +9,6 @@ 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;
@@ -25,11 +16,8 @@ namespace ProxySuper.Core.Models.Projects
             var guid = Guid.NewGuid().ToString();
             Port = 443;
             VLESS_KCP_Port = 2001;
-            VLESS_QUIC_Port = 2002;
-            VLESS_gRPC_Port = 2003;
-
+            VLESS_gRPC_Port = 2002;
             VMESS_KCP_Port = 3001;
-            VMESS_QUIC_Port = 3002;
             ShadowSocksPort = 4001;
 
             UUID = guid;
@@ -38,19 +26,12 @@ namespace ProxySuper.Core.Models.Projects
             VLESS_WS_Path = "/" + Utils.RandomString(6);
             VLESS_KCP_Type = "none";
             VLESS_KCP_Seed = guid;
-            VLESS_QUIC_Key = "";
-            VLESS_QUIC_Type = "none";
-            VLESS_QUIC_Security = "none";
-            VLESS_QUIC_Type = "none";
-            VLESS_gRPC_ServiceName = Utils.RandomString(7);
+            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;
 
@@ -81,21 +62,11 @@ 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);
@@ -110,6 +81,8 @@ namespace ProxySuper.Core.Models.Projects
             }
         }
 
+        //public ProjectType Type { get; set; } = ProjectType.Xray;
+
         /// <summary>
         /// 是否安装证书，
         /// 上传自有证书时选False，则不会自动安装证书。

ProxySuper.Core/Models/Projects/V2raySettings_SS.cs

@@ -19,9 +19,6 @@ 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,7 +1,4 @@
 using ProxySuper.Core.Services;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Documents;
 
 namespace ProxySuper.Core.Models.Projects
 {
@@ -60,37 +57,6 @@ 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,36 +61,5 @@ 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,15 +9,6 @@ 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

@@ -42,7 +42,7 @@ namespace ProxySuper.Core.Models
         [JsonProperty("trojanGoSettings")]
         public TrojanGoSettings TrojanGoSettings { get; set; }
 
-        [JsonProperty("naiveProxySettings")]
+        [JsonProperty("naiveProtoSettings")]
         public NaiveProxySettings NaiveProxySettings { get; set; }
 
         [JsonProperty("brook")]
@@ -51,9 +51,6 @@ namespace ProxySuper.Core.Models
         [JsonProperty("mtProtoGoSettings")]
         public MTProtoGoSettings MTProtoGoSettings { get; set; }
 
-        [JsonProperty]
-        public HysteriaSettings HysteriaSettings { get; set; }
-
 
         [JsonIgnore]
         public ProjectType Type
@@ -70,8 +67,6 @@ 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,11 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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 Include="MvvmCross, Version=7.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmCross.7.1.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>
@@ -44,31 +41,17 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <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 Include="QRCoder, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QRCoder.1.4.1\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 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>
     <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" />
@@ -90,7 +73,6 @@
     <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" />
@@ -108,7 +90,6 @@
     <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" />
@@ -124,9 +105,6 @@
     <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" />
@@ -145,7 +123,6 @@
     <Compile Include="ViewModels\XrayInstallViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

ProxySuper.Core/Services/HysteriaService.cs

@@ -1,172 +0,0 @@
-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,10 +42,7 @@ namespace ProxySuper.Core.Services
                     Progress.Percentage = 50;
 
                     Progress.Step = "5. 生成密钥";
-                    //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');
+                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg generate-secret {Settings.Cleartext}").TrimEnd('\n');
                     Progress.Percentage = 65;
 
                     Progress.Step = "6. 生成配置文件";
@@ -58,7 +55,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:2");
+                    RunCmd($"docker run -d -v /etc/mtg.toml:/config.toml  --name=mtg --restart=always -p {Settings.Port + ":" + Settings.Port} nineseconds/mtg");
                     Progress.Desc = "设置自启动MTProto服务";
 
                     Progress.Step = "安装完成";
@@ -119,8 +116,7 @@ namespace ProxySuper.Core.Services
                     Progress.Percentage = 50;
 
                     Progress.Desc = "生成密钥";
-                    //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');
+                    Settings.SecretText = RunCmd($"docker run nineseconds/mtg 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不匹配！");
                 }
             }
         }
@@ -289,7 +289,7 @@ namespace ProxySuper.Core.Services
             #endregion
 
             // 安装证书
-            Progress.Desc = ("安装TLS证书");
+            Progress.Desc = ("安装Xray证书");
             RunCmd($"mkdir -p {dirPath}");
             RunCmd($"/root/.acme.sh/acme.sh  --installcert  -d {Settings.Domain}  --certpath {certPath} --keypath {keyPath}  --capath {certPath}");
 
@@ -327,7 +327,7 @@ namespace ProxySuper.Core.Services
             var result = RunCmd("id -u");
             if (!result.Equals("0\n"))
             {
-                throw new Exception("请使用Root权限账户登录！");
+                throw new Exception("ProxySU需要使用Root用户进行安装！");
             }
         }
 
@@ -365,9 +365,6 @@ namespace ProxySuper.Core.Services
 
         public void InstallSystemTools()
         {
-            Progress.Desc = ("更新安装包");
-            RunUpdateCmd();
-
             Progress.Desc = ("安装sudo工具");
             InstallSoftware("sudo");
 
@@ -412,7 +409,7 @@ namespace ProxySuper.Core.Services
             string cmd;
 
             Progress.Desc = ("检测IPv4");
-            cmd = RunCmd(@"curl -4 ip.sb");
+            cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv4 --max-time 8");
             IPv4 = cmd.TrimEnd('\r', '\n');
 
             Progress.Desc = ($"IPv4地址为{IPv4}");
@@ -423,7 +420,7 @@ namespace ProxySuper.Core.Services
             else
             {
                 Progress.Desc = ("检测IPv6");
-                cmd = RunCmd(@"curl -6 ip.sb");
+                cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv6 --max-time 8");
                 IPv6 = cmd.TrimEnd('\r', '\n');
                 Progress.Desc = ($"IPv6地址为{IPv6}");
 
@@ -679,8 +676,6 @@ namespace ProxySuper.Core.Services
                     RunCmd("systemctl restart firewalld");
                 }
 
-                // 保持 ssh 端口开放
-                RunCmd($"firewall-cmd --add-port={_host.Port}/tcp --permanent");
                 foreach (var port in portList)
                 {
                     RunCmd($"firewall-cmd --add-port={port}/tcp --permanent");
@@ -698,8 +693,6 @@ namespace ProxySuper.Core.Services
                     RunCmd("echo y | ufw enable");
                 }
 
-                // 保持 ssh 端口开放
-                RunCmd($"ufw allow {_host.Port}/tcp");
                 foreach (var port in portList)
                 {
                     RunCmd($"ufw allow {port}/tcp");
@@ -771,22 +764,6 @@ namespace ProxySuper.Core.Services
             }
         }
 
-        private void RunUpdateCmd()
-        {
-            if (CmdType == CmdType.Apt)
-            {
-                RunCmd($"apt update -y");
-            }
-            else if (CmdType == CmdType.Yum)
-            {
-                RunCmd($"yum update -y");
-            }
-            else
-            {
-                RunCmd($"dnf update -y");
-            }
-        }
-
 
         private ConnectionInfo CreateConnectionInfo()
         {
@@ -802,13 +779,13 @@ namespace ProxySuper.Core.Services
                 if (_host.SecretType == LoginSecretType.PrivateKey)
                 {
                     PrivateKeyFile keyFile;
-                    if (string.IsNullOrEmpty(_host.PrivateKeyPassPhrase))
+                    if (string.IsNullOrEmpty(_host.Password))
                     {
                         keyFile = new PrivateKeyFile(_host.PrivateKeyPath);
                     }
                     else
                     {
-                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.PrivateKeyPassPhrase);
+                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.Password);
                     }
                     authMethods.Add(new PrivateKeyAuthenticationMethod(_host.UserName, keyFile));
                 }
@@ -818,7 +795,6 @@ namespace ProxySuper.Core.Services
                     return new ConnectionInfo(
                         host: _host.Address,
                         username: _host.UserName,
-                        port: _host.Port,
                         authenticationMethods: authMethods.ToArray());
                 }
 
@@ -829,8 +805,7 @@ namespace ProxySuper.Core.Services
                     proxyType: _host.Proxy.Type,
                     proxyHost: _host.Proxy.Address,
                     proxyPort: _host.Proxy.Port,
-                    proxyUsername: _host.Proxy.UserName,
-                    proxyPassword: _host.Proxy.Password,
+                    proxyUsername: _host.Proxy.UserName, proxyPassword: _host.Proxy.Password,
                     authenticationMethods: authMethods.ToArray());
             }
             catch (Exception ex)

ProxySuper.Core/Services/ShareLink.cs

@@ -78,14 +78,12 @@ 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);
@@ -144,15 +142,6 @@ 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;
             }
@@ -173,6 +162,8 @@ namespace ProxySuper.Core.Services
             var _path = "/";
             var _host = settings.Domain;
             var _descriptiveText = string.Empty;
+            var _headerType = "none";
+            var _seed = string.Empty;
 
             switch (xrayType)
             {
@@ -184,7 +175,7 @@ namespace ProxySuper.Core.Services
                 case RayType.VLESS_TCP_XTLS:
                     _protocol = "vless";
                     _type = "tcp";
-                    _security = "tls";
+                    _security = "xtls";
                     _descriptiveText = "vless-tcp-xtls";
                     break;
                 case RayType.VLESS_WS:
@@ -196,17 +187,12 @@ 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";
@@ -227,32 +213,18 @@ namespace ProxySuper.Core.Services
             if (xrayType != RayType.Trojan_TCP)
             {
                 // 4.3 传输层相关段
-                parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&path={HttpUtility.UrlEncode(_path)}";
+                parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&path={HttpUtility.UrlEncode(_path)}&headerType={_headerType}";
 
                 // kcp
                 if (xrayType == RayType.VLESS_KCP)
                 {
-                    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}";
+                    parametersURL += $"&seed={_seed}";
                 }
 
                 // 4.4 TLS 相关段
-                if (settings is XraySettings)
-                {
                 if (xrayType == RayType.VLESS_TCP_XTLS)
                 {
-                        var xraySettings = settings as XraySettings;
-                        parametersURL += $"&flow={xraySettings.Flow}";
-                    }
+                    parametersURL += "&flow=xtls-rprx-direct";
                 }
 
 

ProxySuper.Core/Services/V2rayConfigBuilder.cs

@@ -110,9 +110,8 @@ namespace ProxySuper.Core.Services
 
         public static string BuildV2rayConfig(V2raySettings parameters)
         {
-            var uuidList = new List<string>();
-            uuidList.Add(parameters.UUID);
-            uuidList.AddRange(parameters.MulitUUID);
+            var uuidList = parameters.MulitUUID;
+            uuidList.Insert(0, parameters.UUID);
 
             var xrayConfig = LoadV2rayConfig();
 
@@ -187,7 +186,6 @@ namespace ProxySuper.Core.Services
             }
             #endregion
 
-            #region VLESS GRPC
             if (parameters.Types.Contains(RayType.VLESS_gRPC))
             {
                 var gRPCInBound = GetBound("VLESS_gRPC.json");
@@ -197,9 +195,7 @@ 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");
@@ -209,22 +205,7 @@ 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");
@@ -234,22 +215,7 @@ 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");
@@ -258,7 +224,6 @@ namespace ProxySuper.Core.Services
                 ssBound.settings.method = parameters.ShadowSocksMethod;
                 xrayConfig.inbounds.Add(JToken.FromObject(ssBound));
             }
-            #endregion
 
             return JsonConvert.SerializeObject(
                 xrayConfig,

ProxySuper.Core/Services/V2rayService.cs

@@ -78,7 +78,6 @@ namespace ProxySuper.Core.Services
                     EnableBBR();
 
                     Progress.Desc = "重启V2ray服务";
-
                     RunCmd("systemctl restart caddy");
                     RunCmd("systemctl restart v2ray");
 
@@ -390,7 +389,6 @@ namespace ProxySuper.Core.Services
             RunCmd($"sed -i 's/CapabilityBoundingSet=/#CapabilityBoundingSet=/g' /etc/systemd/system/v2ray.service");
             RunCmd($"sed -i 's/AmbientCapabilities=/#AmbientCapabilities=/g' /etc/systemd/system/v2ray.service");
             RunCmd($"systemctl daemon-reload");
-            RunCmd("systemctl enable v2ray");
 
             if (FileExists("/usr/local/etc/v2ray/config.json"))
             {

ProxySuper.Core/Services/XrayConfigBuilder.cs

@@ -79,8 +79,7 @@ namespace ProxySuper.Core.Services
                 }
                 var domain = parameters.MaskDomain
                     .TrimStart("http://".ToCharArray())
-                    .TrimStart("https://".ToCharArray())
-                    .TrimEnd('/');
+                    .TrimStart("https://".ToCharArray());
 
                 caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n        header_up Host {domain} \n    }}");
             }
@@ -92,7 +91,7 @@ namespace ProxySuper.Core.Services
             return caddyStr;
         }
 
-        private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false, string flow = "")
+        private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false)
         {
             bound.settings.clients.Clear();
             uuidList.ForEach(id =>
@@ -104,19 +103,18 @@ namespace ProxySuper.Core.Services
                 }
                 else
                 {
-                    flow = "xtls-rprx-vision";//兼容普通tls与xtls
-                    obj = new { id = id, flow = flow };
+                    obj = new { id = id, flow = "xtls-rprx-direct" };
                 }
 
                 bound.settings.clients.Add(JToken.FromObject(obj));
             });
         }
 
+
         public static string BuildXrayConfig(XraySettings parameters)
         {
-            var uuidList = new List<string>();
-            uuidList.Add(parameters.UUID);
-            uuidList.AddRange(parameters.MulitUUID);
+            var uuidList = parameters.MulitUUID;
+            uuidList.Insert(0, parameters.UUID);
 
             var xrayConfig = LoadXrayConfig();
 
@@ -127,7 +125,7 @@ namespace ProxySuper.Core.Services
                 dest = FullbackPort
             }));
             xrayConfig.inbounds.Add(baseBound);
-            SetClients(baseBound, uuidList, withXtls: true, flow: parameters.Flow);
+            SetClients(baseBound, uuidList, withXtls: true);
 
             #region Fullbacks
 
@@ -191,7 +189,6 @@ namespace ProxySuper.Core.Services
             }
             #endregion
 
-            #region VLESS GRPC
             if (parameters.Types.Contains(RayType.VLESS_gRPC))
             {
                 var gRPCInBound = GetBound("VLESS_gRPC.json");
@@ -201,9 +198,7 @@ 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");
@@ -213,22 +208,7 @@ 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");
@@ -238,22 +218,7 @@ 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");
@@ -262,7 +227,6 @@ namespace ProxySuper.Core.Services
                 ssBound.settings.method = parameters.ShadowSocksMethod;
                 xrayConfig.inbounds.Add(JToken.FromObject(ssBound));
             }
-            #endregion
 
             return JsonConvert.SerializeObject(
                 xrayConfig,

ProxySuper.Core/Services/XrayService.cs

@@ -268,7 +268,7 @@ namespace ProxySuper.Core.Services
         }
 
 
-        #region 私有方法
+        #region 似有方法
 
         private void DoUploadCert(object sender, CancelEventArgs e)
         {
@@ -424,6 +424,7 @@ namespace ProxySuper.Core.Services
             WriteToFile(configJson, "/etc/caddy/Caddyfile");
         }
 
+
         private void UninstallXray()
         {
             Progress.Desc = "关闭Xray服务";

ProxySuper.Core/ViewModels/HomeViewModel.cs

@@ -53,10 +53,6 @@ namespace ProxySuper.Core.ViewModels
             {
                 ContractResolver = new CamelCasePropertyNamesContractResolver()
             });
-            if (!Directory.Exists("Data"))
-            {
-                Directory.CreateDirectory("Data");
-            }
             File.WriteAllText("Data/Record.json", json);
         }
 
@@ -108,8 +104,6 @@ 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);
@@ -206,21 +200,6 @@ 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)
         {
@@ -276,14 +255,6 @@ 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();
         }
@@ -332,10 +303,6 @@ 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)
@@ -368,10 +335,6 @@ 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

@@ -1,45 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,66 +0,0 @@
-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,14 +42,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        public bool Checked_VLESS_QUIC
-        {
-            get
-            {
-                return Settings.Types.Contains(RayType.VLESS_QUIC);
-            }
-        }
-
         public bool Checked_VLESS_gRPC
         {
             get
@@ -82,14 +74,6 @@ 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,34 +64,12 @@ 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
@@ -134,6 +112,17 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public int ShadowSocksPort
+        {
+            get => Settings.ShadowSocksPort;
+            set
+            {
+                Settings.ShadowSocksPort = value;
+                RaisePropertyChanged("ShadowSocksPort");
+            }
+        }
+
+
         public string UUID
         {
             get => Settings.UUID;
@@ -150,8 +139,7 @@ namespace ProxySuper.Core.ViewModels
             set
             {
                 var input = value.Replace('，', ',');
-                var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-                arr.RemoveAll(x => x == this.UUID);
+                var arr = input.Split(',').ToList();
                 Settings.MulitUUID = arr;
                 RaisePropertyChanged("MultiUUID");
             }
@@ -177,12 +165,12 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        #region Torjan
         public string TrojanPassword
         {
             get => Settings.TrojanPassword;
             set => Settings.TrojanPassword = value;
         }
+
         public bool Checked_Trojan_TCP
         {
             get
@@ -207,18 +195,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.Trojan_TCP, Settings);
         }
-        #endregion
 
-        #region ShadowSocks
-        public int ShadowSocksPort
-        {
-            get => Settings.ShadowSocksPort;
-            set
-            {
-                Settings.ShadowSocksPort = value;
-                RaisePropertyChanged("ShadowSocksPort");
-            }
-        }
+        private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
+        public List<string> ShadowSocksMethods => _ssMethods;
         public bool CheckedShadowSocks
         {
 
@@ -229,7 +208,6 @@ namespace ProxySuper.Core.ViewModels
                 RaisePropertyChanged("CheckedShadowSocks");
             }
         }
-
         public string ShadowSocksPassword
         {
             get => Settings.ShadowSocksPassword;
@@ -251,7 +229,6 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
         }
-        #endregion
 
 
         private void CheckBoxChanged(bool value, RayType type)
@@ -280,11 +257,11 @@ namespace ProxySuper.Core.ViewModels
     }
 
     /// <summary>
-    /// VMESS SETTINGS
+    /// VMESS
     /// </summary>
     public partial class V2rayEditorViewModel
     {
-        #region VMESS TCP
+        // vmess tcp
         public bool Checked_VMESS_TCP
         {
             get => Settings.Types.Contains(RayType.VMESS_TCP);
@@ -303,9 +280,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_TCP, Settings);
         }
-        #endregion
 
-        #region VMESS WS
+        // vmess ws
         public bool Checked_VMESS_WS
         {
             get => Settings.Types.Contains(RayType.VMESS_WS);
@@ -324,9 +300,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_WS, Settings);
         }
-        #endregion
 
-        #region VMESS KCP
+        // vmess kcp
         public string VMESS_KCP_Seed
         {
             get => Settings.VMESS_KCP_Seed;
@@ -357,69 +332,18 @@ 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 SETTINGS
+    /// VLESS
     /// </summary>
     public partial class V2rayEditorViewModel
     {
-        #region VLESS TCP
+        // vless tcp
         public bool Checked_VLESS_TCP
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP);
@@ -433,9 +357,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP, Settings);
         }
-        #endregion
 
-        #region VLESS WS
+
+        // vless ws
         public string VLESS_WS_Path
         {
             get => Settings.VLESS_WS_Path;
@@ -457,9 +381,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_WS, Settings);
         }
-        #endregion
 
-        #region VLESS KCP
+        // vless kcp
         public string VLESS_KCP_Seed
         {
             get => Settings.VLESS_KCP_Seed;
@@ -490,60 +413,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_KCP, Settings);
         }
-        #endregion
 
-        #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
+        // vless grpc
         public string VLESS_gRPC_ServiceName
         {
             get => Settings.VLESS_gRPC_ServiceName;
@@ -567,6 +438,5 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
         }
-        #endregion
     }
 }

ProxySuper.Core/ViewModels/XrayConfigViewModel.cs

@@ -13,16 +13,6 @@ 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
@@ -55,14 +45,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        public bool Checked_VLESS_QUIC
-        {
-            get
-            {
-                return Settings.Types.Contains(RayType.VLESS_QUIC);
-            }
-        }
-
         public bool Checked_VLESS_gRPC
         {
             get
@@ -95,14 +77,6 @@ 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,30 +65,6 @@ 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
@@ -111,17 +87,6 @@ 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;
@@ -142,6 +107,17 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+        public int ShadowSocksPort
+        {
+            get => Settings.ShadowSocksPort;
+            set
+            {
+                Settings.ShadowSocksPort = value;
+                RaisePropertyChanged("ShadowSocksPort");
+            }
+        }
+
+
         public string UUID
         {
             get => Settings.UUID;
@@ -158,8 +134,7 @@ namespace ProxySuper.Core.ViewModels
             set
             {
                 var input = value.Replace('，', ',');
-                var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-                arr.RemoveAll(x => x == this.UUID);
+                var arr = input.Split(',').ToList();
                 Settings.MulitUUID = arr;
                 RaisePropertyChanged("MultiUUID");
             }
@@ -185,7 +160,6 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
-        #region Trojan
         public string TrojanPassword
         {
             get => Settings.TrojanPassword;
@@ -216,18 +190,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.Trojan_TCP, Settings);
         }
-        #endregion
 
-        #region ShadowSocks
-        public int ShadowSocksPort
-        {
-            get => Settings.ShadowSocksPort;
-            set
-            {
-                Settings.ShadowSocksPort = value;
-                RaisePropertyChanged("ShadowSocksPort");
-            }
-        }
+        private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
+        public List<string> ShadowSocksMethods => _ssMethods;
         public bool CheckedShadowSocks
         {
 
@@ -259,7 +224,7 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
         }
-        #endregion
+
 
         private void CheckBoxChanged(bool value, RayType type)
         {
@@ -276,6 +241,8 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+
+
         private void GetUuid()
         {
             UUID = Guid.NewGuid().ToString();
@@ -289,7 +256,7 @@ namespace ProxySuper.Core.ViewModels
     /// </summary>
     public partial class XrayEditorViewModel
     {
-        #region VMESS TCP
+        // vmess tcp
         public bool Checked_VMESS_TCP
         {
             get => Settings.Types.Contains(RayType.VMESS_TCP);
@@ -308,9 +275,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_TCP, Settings);
         }
-        #endregion
 
-        #region VMESS WS
+        // vmess ws
         public bool Checked_VMESS_WS
         {
             get => Settings.Types.Contains(RayType.VMESS_WS);
@@ -329,9 +295,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VMESS_WS, Settings);
         }
-        #endregion
 
-        #region VMESS KCP
+        // vmess kcp
         public string VMESS_KCP_Seed
         {
             get => Settings.VMESS_KCP_Seed;
@@ -362,60 +327,10 @@ 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>
@@ -423,19 +338,8 @@ namespace ProxySuper.Core.ViewModels
     /// </summary>
     public partial class XrayEditorViewModel
     {
-        #region VLESS XTLS
 
-        public List<string> FlowList { get => XraySettings.FlowList; }
-
-        public string Flow
-        {
-            get => Settings.Flow;
-            set
-            {
-                Settings.Flow = value;
-                RaisePropertyChanged(nameof(Flow));
-            }
-        }
+        // vless xtls
         public bool Checked_VLESS_TCP_XTLS
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP_XTLS);
@@ -449,9 +353,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP_XTLS, Settings);
         }
-        #endregion
 
-        #region VLESS TCP
+        // vless tcp
         public bool Checked_VLESS_TCP
         {
             get => Settings.Types.Contains(RayType.VLESS_TCP);
@@ -465,9 +368,9 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_TCP, Settings);
         }
-        #endregion
 
-        #region VLESS WS
+
+        // vless ws
         public string VLESS_WS_Path
         {
             get => Settings.VLESS_WS_Path;
@@ -489,68 +392,12 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_WS, Settings);
         }
-        #endregion
 
-        #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
+        // vless kcp
         public string VLESS_KCP_Seed
         {
             get => Settings.VLESS_KCP_Seed;
-            set
-            {
-                Settings.VLESS_KCP_Seed = value;
-                RaisePropertyChanged(nameof(VLESS_KCP_Seed));
-            }
+            set => Settings.VLESS_KCP_Seed = value;
         }
         public string VLESS_KCP_Type
         {
@@ -577,9 +424,8 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_KCP, Settings);
         }
-        #endregion
 
-        #region VLESS gRPC
+        // vless grpc
         public string VLESS_gRPC_ServiceName
         {
             get => Settings.VLESS_gRPC_ServiceName;
@@ -603,7 +449,6 @@ namespace ProxySuper.Core.ViewModels
         {
             get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
         }
-        #endregion
     }
 
 }

ProxySuper.Core/app.config

@@ -1,15 +0,0 @@
-<?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,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <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="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="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,18 +1,6 @@
-<?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>
-                <!--Language-->
+                <!--Languages-->
                 <ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
-                <!--style-->
+
+                <!--styles-->
                 <ResourceDictionary>
                     <Style TargetType="{x:Type TextBox}">
                         <Setter Property="Padding" Value="5,2" />
@@ -24,7 +24,7 @@
                     </Style>
                 </ResourceDictionary>
 
-                <!--component style-->
+                <!--components styles-->
                 <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<Setup>();
+            this.RegisterSetupType<MvxWpfSetup<Core.App>>();
         }
     }
 }

ProxySuper.WPF/Controls/HostControl.xaml

@@ -13,15 +13,11 @@
     <UserControl.Resources>
         <convert:LoginSecretTypeConverter x:Key="SecretTypeConverter" />
         <convert:ProxyTypeConverter x:Key="ProxyTypeConverter" />
-        <convert:BooleanOrConverter x:Key="BooleanOrConverter" />
-        <convert:BooleanOrToVisibilityConverter x:Key="BooleanOrToVisibilityConverter" />
-        <convert:VisibleConverter x:Key="VisibleConverter" />
-        
     </UserControl.Resources>
     
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="330" />
+            <RowDefinition Height="300" />
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         
@@ -40,7 +36,6 @@
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
                 </Grid.RowDefinitions>
 
                 <Grid.ColumnDefinitions>
@@ -99,13 +94,7 @@
                                  }" />
                 </StackPanel>
 
-                <Label Content="{DynamicResource HostUploadSecretKey}" 
-                       Grid.Row="6" Grid.Column="0" 
-                       Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"/> 
+                <Label Content="{DynamicResource HostUploadSecretKey}" Grid.Row="6" Grid.Column="0" /> 
                 <Button Height="24"
                         Width="100"
                         HorizontalAlignment="Left"
@@ -116,54 +105,7 @@
                             Converter={StaticResource SecretTypeConverter},
                             ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
                         }"
-                        Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"
                         Content="{DynamicResource HostUploadSecretKey}" /> 
-
-                <Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" 
-                       Grid.Row="7" Grid.Column="0" 
-                       Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"/>
-                <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}
-                        }"
-                        Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"
-                         VerticalContentAlignment="Center" Height="26" >
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
             </Grid>
         </GroupBox>
 
@@ -190,13 +132,6 @@
                                     Converter={StaticResource ProxyTypeConverter},
                                     ConverterParameter={x:Static ssh:ProxyTypes.None}
                                  }"/>
-                    <RadioButton Content="{DynamicResource ProxyTypeSocks5}"
-                                 Margin="5,0"
-                                 IsChecked="{
-                                    Binding Host.Proxy.Type,
-                                    Converter={StaticResource ProxyTypeConverter},
-                                    ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
-                                 }"/>
                     <RadioButton Content="{DynamicResource ProxyTypeHttp}"
                                  Margin="5,0"
                                  IsChecked="{
@@ -204,168 +139,26 @@
                                     Converter={StaticResource ProxyTypeConverter},
                                     ConverterParameter={x:Static ssh:ProxyTypes.Http}
                                  }"/>
-                </StackPanel>
-
-                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Address}" 
-                         Grid.Row="1" 
-                         Grid.Column="1" >
-                    <!-- IsEnabled="{
+                    <RadioButton Content="{DynamicResource ProxyTypeSocks5}"
+                                 Margin="5,0"
+                                 IsChecked="{
                                     Binding Host.Proxy.Type,
                                     Converter={StaticResource ProxyTypeConverter},
                                     ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
-                         }" -->
-                         <TextBox.IsEnabled>
-                            <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                            </MultiBinding>
-                        </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                </TextBox>
+                                 }"/>
+                </StackPanel>
 
-                <Label Content="{DynamicResource HostPort}" Grid.Row="2" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="2" Grid.Column="1" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                </TextBox>
+                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Address}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="3" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="3" Grid.Column="1" Height="26" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
+                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="2" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="2" Grid.Column="1" />
 
-                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" Height="26" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock Height="auto" FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
+                <Label Content="{DynamicResource HostPort}" Grid.Row="3" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="3" Grid.Column="1" />
+
+                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" />
 
             </Grid>
         </GroupBox>

ProxySuper.WPF/Controls/V2raySettingsControl.xaml

@@ -11,170 +11,131 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
-    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
-        <!--节点类型-->
-        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
     <StackPanel Orientation="Horizontal">
-                <!--#region VLESS -->
-                <WrapPanel Orientation="Vertical">
+        <StackPanel Width="220">
             <!--TCP-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_TCP}">
                 <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
 
             <!--WebSocket-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_WS}">
                 <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
             </CheckBox>
 
             <!--mKCP-->
-                    <CheckBox Width="150"
+            <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>
 
-                    <!--quic-->
-                    <CheckBox Width="150"
-                              VerticalContentAlignment="Center"
-                              Foreground="LimeGreen"
-                              IsChecked="{Binding Path=Checked_VLESS_QUIC}">
-                        <Label Content="{DynamicResource VlessQuicDesc}"  FontSize="12" Foreground="LimeGreen" />
-                    </CheckBox>
-
             <!--gRPC-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                        <Label  Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
+                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
-                </WrapPanel>
-                <!--#endregion-->
 
-                <!--#region VMESS -->
-                <WrapPanel Orientation="Vertical">
+            <!--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}" />-->
+
             <!--WebSocket-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_WS}">
                 <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
             </CheckBox>
 
             <!--mKCP-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_KCP}">
                 <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
             </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-->
-
-                <!--#region SS And Trojan -->
-                <WrapPanel Orientation="Vertical">
             <!--ss-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=CheckedShadowSocks}">
                 <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
             </CheckBox>
 
             <!--Trojan-->
-                    <CheckBox Width="150"
+            <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>
-                </WrapPanel>
-                <!--#endregion-->
+
         </StackPanel>
-        </GroupBox>
 
         <!--************************** 参数 **************************-->
 
-        <!--参数设置-->
-        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
         <StackPanel>
-                <!--#region Common Settings -->
+
             <!--Domain-->
-                <StackPanel Orientation="Horizontal">
+            <StackPanel Margin="30,15,0,0"
+                    Orientation="Horizontal">
                 <Label Content="{DynamicResource XrayDomain}" Width="120"  />
                 <TextBox Text="{Binding Path=Domain}" Width="200"  />
             </StackPanel>
 
-                <!--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}" />
+            <!--Mask Domain-->
+            <StackPanel Margin="30,15,0,0"
+                    Orientation="Horizontal">
+                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
             </StackPanel>
 
-                <!--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">
+            <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>
-                            <!--#endregion-->
 
-                            <!--Mask Domain-->
-                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
+            <!--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>
 
-                            <!--#region VLESS WebSocket Settings -->
             <!--WebSocket Path-->
-                            <StackPanel Margin="0,15,0,0"
+            <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" />
+                <TextBox Text="{Binding Path=VLESS_WS_Path}"
+                        Width="200" />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VLESS KCP Settings -->
             <!--seed-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VLESS_KCP,
@@ -185,12 +146,12 @@
             </StackPanel>
 
             <!--kcp type-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                 Visibility="{
                     Binding Path=Checked_VLESS_KCP,
                     Converter={StaticResource VisibleConverter}
-                                }"
-                                Orientation="Horizontal">
+                }" Orientation="Horizontal">
+
                 <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
                 <ComboBox Width="200" 
                         ItemsSource="{Binding Path=KcpTypes}"
@@ -199,7 +160,7 @@
             </StackPanel>
 
             <!--kcp port-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                 Visibility="{
                     Binding Path=Checked_VLESS_KCP,
                     Converter={StaticResource VisibleConverter}
@@ -208,64 +169,9 @@
                 <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"
+            <StackPanel Margin="30,15,0,0"
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VLESS_gRPC,
@@ -275,7 +181,7 @@
                 <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
             </StackPanel>
 
-                            <StackPanel Margin="0,15,0,0" 
+            <StackPanel Margin="30,15,0,0" 
                         Orientation="Horizontal" 
                         Visibility="{
                             Binding Path=Checked_VLESS_gRPC,
@@ -284,11 +190,22 @@
                 <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
                 <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VMESS WebSocket Settings -->
+            <!--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="0,15,0,0" 
+            <StackPanel Margin="30,15,0,0" 
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VMESS_WS,
@@ -299,11 +216,9 @@
                         VerticalAlignment="Bottom"
                         Width="200" />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VMESS KCP Settings -->
             <!--seed-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VMESS_KCP,
@@ -314,7 +229,7 @@
             </StackPanel>
 
             <!--kcp type-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                         Orientation="Horizontal"
                         Visibility="{
                             Binding Path=Checked_VMESS_KCP,
@@ -329,7 +244,7 @@
             </StackPanel>
 
             <!--kcp port-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VMESS_KCP,
@@ -338,75 +253,21 @@
                 <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" 
+            <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"/>
+                <TextBox Text="{Binding Path=ShadowSocksPassword}"
+                        Width="200"/>
             </StackPanel>
 
             <!--ss加密方式-->
-                            <StackPanel Margin="0,15,0,0" 
+            <StackPanel Margin="30,15,0,0" 
                     Orientation="Horizontal" 
                     Visibility="{
                         Binding Path=CheckedShadowSocks,
@@ -420,7 +281,7 @@
             </StackPanel>
 
             <!--ss端口-->
-                            <StackPanel Margin="0,15,0,0" 
+            <StackPanel Margin="30,15,0,0" 
                     Orientation="Horizontal" 
                     Visibility="{
                         Binding Path=CheckedShadowSocks,
@@ -429,24 +290,30 @@
                 <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" 
+            <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" />
+                <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>
-                            <!--#endregion-->
 
-                            <!--#region Multiple Users Settings -->
             <!--多用户-->
-                            <StackPanel Margin="0,15,0,0" Orientation="Vertical">
+            <StackPanel Margin="30,10,0,0"
+                        Orientation="Vertical">
                 <StackPanel Orientation="Horizontal">
                     <Label Content="{DynamicResource MultiUser}" Width="120" />
 
@@ -459,12 +326,7 @@
                     <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
                 </StackPanel>
             </StackPanel>
-                            <!--#endregion-->
         </StackPanel>
-                    </Expander.Content>
-                </Expander>
-            </StackPanel>
-        </GroupBox>
     </StackPanel>
 
 </UserControl>

ProxySuper.WPF/Controls/VLESS_QUIC_Control.xaml

@@ -1,61 +0,0 @@
-<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

@@ -1,28 +0,0 @@
-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,12 +23,7 @@
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
             <Label Content="流控(flow)" Width="140" />
-            <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" />
+            <TextBox Text="xtls-rprx-direct" IsReadOnly="True" Width="300" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
@@ -58,7 +53,7 @@
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
             <Label Content="传输安全(tls)" Width="140" />
-            <TextBox Text="tls" IsReadOnly="True" Width="300" />
+            <TextBox Text="xtls" IsReadOnly="True" Width="300" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

ProxySuper.WPF/Controls/VMESS_QUIC_Control.xaml

@@ -1,62 +0,0 @@
-<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

@@ -1,28 +0,0 @@
-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,178 +11,103 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
-    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
-        <!--节点类型-->
-        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
     <StackPanel Orientation="Horizontal">
-                <!--#region VLESS -->
-                <WrapPanel Orientation="Vertical">
-                    <!--XTLS+Reality-->
-                    <CheckBox Width="150"
-                              VerticalContentAlignment="Center"
-                              IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
-                        <Label Content="{DynamicResource VlessXtlsRealityDesc}"  FontSize="12" Foreground="LimeGreen" />
-                    </CheckBox>
-
+        <StackPanel Width="220">
             <!--XTLS-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,10,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
-                        <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="12" Foreground="LimeGreen" />
+                <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
 
             <!--TCP-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_TCP}">
-                        <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="12" Foreground="LimeGreen" />
+                <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
 
             <!--WebSocket-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_WS}">
-                        <Label Content="{DynamicResource VlessWsDesc}"  FontSize="12"  Foreground="LimeGreen" />
+                <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
             </CheckBox>
 
             <!--mKCP-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_KCP}">
-                        <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="12" 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" />
+                <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
 
             <!--gRPC-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                        <Label Content="{DynamicResource VlessRpcDesc}" FontSize="12" Foreground="LimeGreen" />
+                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
             </CheckBox>
-                </WrapPanel>
-                <!--#endregion-->
 
-                <!--#region VMESS -->
-                <WrapPanel Orientation="Vertical">
+            <!--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}" />-->
+
             <!--WebSocket-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_WS}">
-                        <Label Content="{DynamicResource VmessWsDesc}" FontSize="12" Foreground="Blue" />
+                <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
             </CheckBox>
 
             <!--mKCP-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_KCP}">
-                        <Label Foreground="Blue" FontSize="12" Content="{DynamicResource VmessKcpDesc}" />
+                <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
             </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-->
-
-                <!--#region SS And Trojan -->
-                <WrapPanel Orientation="Vertical">
             <!--ss-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=CheckedShadowSocks}">
-                        <Label Content="{DynamicResource SSDesc}" FontSize="12"  Foreground="Fuchsia" />
+                <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
             </CheckBox>
 
             <!--Trojan-->
-                    <CheckBox Width="150"
+            <CheckBox Margin="0,15,0,0"
                       Foreground="CadetBlue"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_Trojan_TCP}">
-                        <Label Content="{DynamicResource TrojanDesc}"  FontSize="12" Foreground="CadetBlue" />
+                <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
             </CheckBox>
-                </WrapPanel>
-                <!--#endregion-->
-            </StackPanel>
-        </GroupBox>
 
-        <!--参数设置-->
-        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
+        </StackPanel>
+
+        <!--************************** 参数 **************************-->
+
         <StackPanel>
-                <!--#region Base Settings -->
+
             <!--Domain-->
-                <StackPanel Orientation="Horizontal">
+            <StackPanel Margin="30,15,0,0"
+                    Orientation="Horizontal">
                 <Label Content="{DynamicResource XrayDomain}" Width="120"  />
-                    <TextBox Text="{Binding Path=Domain}" Width="260"  />
+                <TextBox Text="{Binding Path=Domain}" Width="200"  />
             </StackPanel>
 
-                <!--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}" />
+            <!--Mask Domain-->
+            <StackPanel Margin="30,15,0,0"
+                    Orientation="Horizontal">
+                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
             </StackPanel>
 
-                <!--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">
+            <StackPanel Margin="30,15,0,0"
+                        Orientation="Horizontal">
                 <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
                 <CheckBox IsChecked="{Binding Path=WithTLS}" 
                           Content="{DynamicResource XrayWithTLSDesc}"
@@ -190,143 +115,104 @@
                           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-->
+            <!--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>
 
-                            <!--#region VLESS WS Settings -->
             <!--WebSocket Path-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="260" />
+                <TextBox Text="{Binding Path=VLESS_WS_Path}"
+                        Width="200" />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VLESS KCP SETTINGS -->
             <!--seed-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="260"  />
+                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
             </StackPanel>
 
             <!--kcp type-->
-                            <StackPanel Margin="0,15,0,0"
+            <StackPanel Margin="30,15,0,0"
                 Visibility="{
                     Binding Path=Checked_VLESS_KCP,
                     Converter={StaticResource VisibleConverter}
-                                        }"
-                                        Orientation="Horizontal">
+                }" Orientation="Horizontal">
+
                 <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
-                                <ComboBox Width="260" 
+                <ComboBox Width="200" 
                         ItemsSource="{Binding Path=KcpTypes}"
                         SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
                 </ComboBox>
             </StackPanel>
 
             <!--kcp port-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="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" />
+                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
             </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"
+            <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="260"  />
+                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
             </StackPanel>
 
-                            <StackPanel Margin="0,15,0,0" 
+            <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="260"  />
+                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VMESS WS SETTINGS -->
+            <!--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="0,15,0,0" 
+            <StackPanel Margin="30,15,0,0" 
                     Orientation="Horizontal"
                     Visibility="{
                         Binding Path=Checked_VMESS_WS,
@@ -335,31 +221,29 @@
                 <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
                 <TextBox Text="{Binding Path=VMESS_WS_Path}"
                         VerticalAlignment="Bottom"
-                                        Width="260" />
+                        Width="200" />
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region VMESS KCP SETTINGS -->
             <!--seed-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="260" />
+                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
             </StackPanel>
 
             <!--kcp type-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="260" 
+                <ComboBox Width="200" 
                           VerticalAlignment="Bottom"
                           ItemsSource="{Binding Path=KcpTypes}"
                           SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
@@ -367,142 +251,89 @@
             </StackPanel>
 
             <!--kcp port-->
-                            <StackPanel Margin="0,15,0,0"
+            <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="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" />
+                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
             </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" 
+            <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="260"/>
+                <TextBox Text="{Binding Path=ShadowSocksPassword}"
+                        Width="200"/>
             </StackPanel>
 
             <!--ss加密方式-->
-                            <StackPanel Margin="0,15,0,0" 
+            <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="260"
+                <ComboBox Width="200"
                         ItemsSource="{Binding ShadowSocksMethods}"
                         SelectedValue="{Binding ShadowSocksMethod}">
                 </ComboBox>
             </StackPanel>
             
             <!--ss端口-->
-                            <StackPanel Margin="0,15,0,0" 
+            <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="260"/>
+                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
             </StackPanel>
-                            <!--#endregion-->
 
-                            <!--#region Trojan Settings -->
             <!--Trojan密码-->
-                            <StackPanel Margin="0,15,0,0" 
+            <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="260" />
+                <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>
-                            <!--#endregion-->
 
-                            <!--#region Multiple Users Settings -->
             <!--多用户-->
-                            <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+            <StackPanel Margin="30,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" />
+                             Width="200" />
                 </StackPanel>
-
                 <StackPanel>
                     <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
                 </StackPanel>
             </StackPanel>
-                            <!--#endregion-->
         </StackPanel>
-                    </Expander.Content>
-                </Expander>
-            </StackPanel>
-        </GroupBox>
     </StackPanel>
+
 </UserControl>

ProxySuper.WPF/MainWindow.xaml

@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Icon="/Resources/ProxySU.ico"
-        Title="ProxySU   v4.2.0" Height="600" Width="1000">
+        Title="ProxySU" 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.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.0.4.0")]
+[assembly: AssemblyFileVersion("4.0.4.0")]

ProxySuper.WPF/ProxySuper.WPF.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
   　　<AllowedReferenceRelatedFileExtensions>
@@ -19,7 +18,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -33,28 +32,19 @@
     <StartupObject>ProxySuper.WPF.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
+    <Reference Include="MvvmCross, Version=7.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmCross.7.1.2\lib\net461\MvvmCross.dll</HintPath>
     </Reference>
-    <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 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>
-    <Reference Include="MvvmCross, Version=8.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmCross.8.0.2\lib\net461\MvvmCross.dll</HintPath>
+    <Reference Include="QRCoder, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QRCoder.1.4.1\lib\net40\QRCoder.dll</HintPath>
     </Reference>
-    <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="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 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>
     <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">
@@ -62,16 +52,6 @@
     </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>
@@ -116,9 +96,6 @@
     <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>
@@ -131,9 +108,6 @@
     <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>
@@ -146,7 +120,6 @@
     <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>
@@ -162,15 +135,6 @@
     <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>
@@ -180,14 +144,14 @@
     <Compile Include="Views\MTProxyGo\MTProxyGoInstallView.xaml.cs">
       <DependentUpon>MTProxyGoInstallView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProxy\NaiveProxyConfigView.xaml.cs">
-      <DependentUpon>NaiveProxyConfigView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProto\NaiveProtoConfigView.xaml.cs">
+      <DependentUpon>NaiveProtoConfigView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProxy\NaiveProxyEditorView.xaml.cs">
-      <DependentUpon>NaiveProxyEditorView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProto\NaiveProtoEditorView.xaml.cs">
+      <DependentUpon>NaiveProtoEditorView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProxy\NaiveProxyInstallView.xaml.cs">
-      <DependentUpon>NaiveProxyInstallView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProto\NaiveProtoInstallView.xaml.cs">
+      <DependentUpon>NaiveProtoInstallView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\ShareLinkView.xaml.cs">
       <DependentUpon>ShareLinkView.xaml</DependentUpon>
@@ -247,10 +211,6 @@
       <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>
@@ -267,10 +227,6 @@
       <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>
@@ -321,11 +277,6 @@
       <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>
@@ -336,18 +287,6 @@
       <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>
@@ -360,15 +299,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProxy\NaiveProxyConfigView.xaml">
+    <Page Include="Views\NaiveProto\NaiveProtoConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProxy\NaiveProxyEditorView.xaml">
+    <Page Include="Views\NaiveProto\NaiveProtoEditorView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProxy\NaiveProxyInstallView.xaml">
+    <Page Include="Views\NaiveProto\NaiveProtoInstallView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -436,9 +375,6 @@
       <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>
@@ -526,9 +462,6 @@
     <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>
@@ -541,9 +474,6 @@
     <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>
@@ -640,9 +570,6 @@
     <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>
@@ -655,9 +582,6 @@
     <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>
@@ -716,10 +640,5 @@
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
 </Project>

ProxySuper.WPF/Resources/Languages/en.xaml

@@ -22,14 +22,12 @@
     <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>
     <sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
     <sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">Related Resources and Tutorials</sys:String>
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">Tag</sys:String>
@@ -41,7 +39,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">Down</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortDone">Done</sys:String>
 
 
     <!--Editor Window-->
@@ -52,12 +50,10 @@
     <sys:String x:Key="HostPassword">Password</sys:String>
     <sys:String x:Key="HostPort">Port</sys:String>
     <sys:String x:Key="HostSecretType">SecretType</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">LoadingKey</sys:String>
+    <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="TextBoxContentTipsNoneBlank">None,Blank</sys:String>
 
     <sys:String x:Key="ProxyGroupName">Proxy</sys:String>
     <sys:String x:Key="ProxyAddress">Address</sys:String>
@@ -69,60 +65,41 @@
     <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="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</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="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="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>
@@ -155,13 +132,4 @@
     <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

@@ -1,167 +0,0 @@
-<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>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">منابع و آموزش های مرتبط</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="TextBoxContentTipsNoneBlank">اگر هیچ کدام، آن را خالی بگذارید</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">Socks5</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="VlessXtlsRealityDesc" xml:space="preserve">VLESS TCP XTLS REALITY</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">چند کاربره</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,14 +22,12 @@
     <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>
     <sys:String x:Key="MainMenuHelperCertQuestion">證書問題</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">私鑰問題</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相關資源與教程</sys:String>
+
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">名稱</sys:String>
@@ -52,12 +50,9 @@
     <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="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="TextBoxContentTipsNoneBlank">若無,則留空</sys:String>
 
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@@ -69,23 +64,15 @@
     <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="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</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="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="XrayDomain">域名/IP</sys:String>
@@ -93,37 +80,25 @@
     <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="V2rayPort">V2ray端口</sys:String>
-    <sys:String x:Key="XrayPort">XRAY端口</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>
@@ -157,13 +132,4 @@
     <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,14 +22,12 @@
     <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>
     <sys:String x:Key="MainMenuHelperCertQuestion">证书问题</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">私钥问题</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相关资源与教程</sys:String>
+
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">名称</sys:String>
@@ -53,12 +51,9 @@
     <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="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="TextBoxContentTipsNoneBlank">若无,则留空</sys:String>
 
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@@ -70,23 +65,15 @@
     <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="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</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="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="XrayDomain">域名/IP</sys:String>
@@ -94,37 +81,25 @@
     <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="V2rayPort">V2ray端口</sys:String>
-    <sys:String x:Key="XrayPort">XRAY端口</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>
@@ -158,13 +133,4 @@
     <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="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

@@ -1,23 +0,0 @@
-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

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

ProxySuper.WPF/Templates/trojan-go/trojan-go.json

@@ -1,5 +1,4 @@
 {
-  "log_level": 5,
   "run_type": "server",
   "local_addr": "0.0.0.0",
   "local_port": 443,

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

@@ -1,31 +0,0 @@
-{
-  "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

@@ -1,31 +0,0 @@
-{
-  "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

@@ -1,31 +0,0 @@
-{
-  "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-vision"
+        "flow": "xtls-rprx-direct"
       }
     ],
     "decryption": "none",
@@ -13,13 +13,15 @@
   },
   "streamSettings": {
     "network": "tcp",
-    "security": "tls",
-    "tlsSettings": {
-      "rejectUnknownSni": true,
+    "security": "xtls",
+    "xtlsSettings": {
+      "allowInsecure": false,
       "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

@@ -1,31 +0,0 @@
-{
-  "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,9 +1,10 @@
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Views;
 
 namespace ProxySuper.WPF.Views
 {
-    [MvxWindowPresentation]
+    /// <summary>
+    /// BrookConfigView.xaml 的交互逻辑
+    /// </summary>
     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="640" Width="1000">
+        Title="BrookEditorView" Height="600" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -24,20 +24,19 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <Grid Grid.Column="2" Margin="10,10,0,0">
+        <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="*" />
-                <RowDefinition Height="50" />
+                    <RowDefinition Height="36" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
                 <Label Content="类型" Grid.Row="0" Grid.Column="0" />
@@ -60,10 +59,12 @@
 
                 <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>
 
-            <Border Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#eee" BorderThickness="0,1,0,0">
+            <Border BorderBrush="#eee" BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            HorizontalAlignment="Right">
+                            HorizontalAlignment="Right"
+                            Margin="0,20,0,0">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
                             HorizontalAlignment="Right"
@@ -78,6 +79,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </Grid>
+        </StackPanel>
     </Grid>
 </views:MvxWindow>

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

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

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

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

ProxySuper.WPF/Views/EnableRootView.xaml.cs

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

ProxySuper.WPF/Views/HomeView.xaml

@@ -21,7 +21,6 @@
                 <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">
@@ -33,7 +32,6 @@
                 <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">
@@ -41,7 +39,6 @@
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperUseRoot}" Click="LaunchUseRootSite"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperCertQuestion}" Click="LaunchCertQuestion"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperPrivateKey}" Click="LaunchPrivateKeyQuestion"></MenuItem>
-                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperResourcesAndTutorials}" Click="LaunchResourcesAndTutorials"></MenuItem>
             </MenuItem>
         </Menu>
 
@@ -88,10 +85,7 @@
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
 
-                    <DataGridTemplateColumn  Width="400">
-                        <DataGridTemplateColumn.Header>
-                            <TextBlock Text="{DynamicResource MainDataGridColumnAction}" />
-                        </DataGridTemplateColumn.Header>
+                    <DataGridTemplateColumn Header="{DynamicResource MainDataGridColumnAction}" Width="400">
                         <DataGridTemplateColumn.CellTemplate>
                             <ItemContainerTemplate>
                                 <StackPanel Orientation="Horizontal">

ProxySuper.WPF/Views/HomeView.xaml.cs

@@ -1,8 +1,6 @@
 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;
@@ -12,8 +10,9 @@ using System.Windows;
 
 namespace ProxySuper.WPF.Views
 {
-    [MvxContentPresentation]
-    [MvxViewFor(typeof(HomeViewModel))]
+    /// <summary>
+    /// HomeView.xaml 的交互逻辑
+    /// </summary>
     public partial class HomeView : MvxWpfView
     {
 
@@ -62,10 +61,6 @@ namespace ProxySuper.WPF.Views
             System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/PrivateKey%E8%BD%AC%E6%8D%A2");
         }
 
-        private void LaunchResourcesAndTutorials(object sender, RoutedEventArgs e)
-        {
-            System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/%E7%9B%B8%E5%85%B3%E8%B5%84%E6%BA%90%E4%B8%8E%E6%95%99%E7%A8%8B");
-        }
 
         ResourceDictionary resource = new ResourceDictionary();
         private void SetSimpleChinese(object sender, RoutedEventArgs e)
@@ -73,11 +68,7 @@ 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

@@ -1,14 +0,0 @@
-<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

@@ -1,30 +0,0 @@
-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

@@ -1,88 +0,0 @@
-<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

@@ -1,29 +0,0 @@
-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

@@ -1,34 +0,0 @@
-<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

@@ -1,30 +0,0 @@
-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,5 +1,4 @@
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +15,9 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.MTProtoGo
 {
-    [MvxWindowPresentation]
+    /// <summary>
+    /// MTProtoGoConfigView.xaml 的交互逻辑
+    /// </summary>
     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="640" Width="1000">
+        Title="MTProto-Go编辑配置" Height="600" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -24,18 +24,16 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <Grid Grid.Column="2" Margin="10,10,0,0">
+        <StackPanel Grid.Column="2">
+            <Grid Margin="10">
                 <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" />
@@ -46,13 +44,14 @@
 
                 <Label Content="{DynamicResource MTProtoCleartext}" Grid.Row="2" Grid.Column="0" />
                 <TextBox Text="{Binding Settings.Cleartext}" Grid.Row="2" Grid.Column="1" />
+            </Grid>
 
 
-            <Border Grid.Row="4"
-                    Grid.ColumnSpan="3"
+            <Border Grid.Row="1"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
+                            Margin="0,20,0,0"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
@@ -68,6 +67,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </Grid>
+        </StackPanel>
     </Grid>
 </views:MvxWindow>

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

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

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

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

ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml

@@ -1,4 +1,4 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyConfigView"
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoConfigView"
         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"
@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="NaiveProxy配置" Height="450" Width="800">
+        Title="NaiveProxyConfigView" Height="450" Width="800">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="140" />

ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs

@@ -0,0 +1,15 @@
+using MvvmCross.Platforms.Wpf.Views;
+
+namespace ProxySuper.WPF.Views
+{
+    /// <summary>
+    /// NaiveProxyConfigView.xaml 的交互逻辑
+    /// </summary>
+    public partial class NaiveProtoConfigView : MvxWindow
+    {
+        public NaiveProtoConfigView()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml

@@ -0,0 +1,77 @@
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoEditorView"
+        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:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
+        xmlns:local="clr-namespace:ProxySuper.WPF.Views"
+        xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
+        mc:Ignorable="d"
+        BorderThickness="0,1,0,0"
+        BorderBrush="#eee"
+        Icon="/Resources/ProxySU.ico"
+        WindowStartupLocation="CenterScreen"
+        Title="NaiveProxy" Height="600" 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>
+
+        <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>
+
+                <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 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 NaiveProxyMaskDomain}" Grid.Row="4" Grid.Column="0" />
+                <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="4" Grid.Column="1" />
+            </Grid>
+
+            <Border BorderBrush="#eee" BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" 
+                            HorizontalAlignment="Right"
+                            Margin="0,20,0,0">
+                    <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>
+        </StackPanel>
+    </Grid>
+</views:MvxWindow>

ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs

@@ -0,0 +1,15 @@
+using MvvmCross.Platforms.Wpf.Views;
+
+namespace ProxySuper.WPF.Views
+{
+    /// <summary>
+    /// NaiveProxyEditorView.xaml 的交互逻辑
+    /// </summary>
+    public partial class NaiveProtoEditorView : MvxWindow
+    {
+        public NaiveProtoEditorView()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml

@@ -1,4 +1,4 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProxyInstallView"
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProtoInstallView"
         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"
@@ -8,7 +8,7 @@
         xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="TrojanGo安装" Height="600" Width="1000">
+        Title="TrojanGoInstallView" Height="600" Width="1000">
     <StackPanel>
         <ctrl:ProgressControl />
 

ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs

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

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

@@ -1,14 +0,0 @@
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
-using MvvmCross.Platforms.Wpf.Views;
-
-namespace ProxySuper.WPF.Views
-{
-    [MvxWindowPresentation]
-    public partial class NaiveProxyConfigView : MvxWindow
-    {
-        public NaiveProxyConfigView()
-        {
-            InitializeComponent();
-        }
-    }
-}

ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml

@@ -1,78 +0,0 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyEditorView"
-        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:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
-        xmlns:local="clr-namespace:ProxySuper.WPF.Views"
-        xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
-        mc:Ignorable="d"
-        BorderThickness="0,1,0,0"
-        BorderBrush="#eee"
-        Icon="/Resources/ProxySU.ico"
-        WindowStartupLocation="CenterScreen"
-        Title="NaiveProxy编辑配置" 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.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 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 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" />
-
-            <Border Grid.Row="6" 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/NaiveProxy/NaiveProxyEditorView.xaml.cs

@@ -1,14 +0,0 @@
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
-using MvvmCross.Platforms.Wpf.Views;
-
-namespace ProxySuper.WPF.Views
-{
-    [MvxWindowPresentation]
-    public partial class NaiveProxyEditorView : MvxWindow
-    {
-        public NaiveProxyEditorView()
-        {
-            InitializeComponent();
-        }
-    }
-}

ProxySuper.WPF/Views/ShareLinkView.xaml.cs

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

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

@@ -1,10 +1,11 @@
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.ViewModels;
 
 namespace ProxySuper.WPF.Views
 {
-    [MvxWindowPresentation]
+    /// <summary>
+    /// TrojanGoConfigView.xaml 的交互逻辑
+    /// </summary>
     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="640" Width="1000">
+        Title="Trojan-Go编辑配置" Height="600" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -24,7 +24,8 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <Grid Margin="10,10,0,0" Grid.Column="2">
+        <StackPanel Grid.Column="2">
+            <Grid Margin="10">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
@@ -32,13 +33,11 @@
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
                     <RowDefinition Height="36" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="50" />
+                    <RowDefinition Height="36" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
                 <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
@@ -64,12 +63,14 @@
                           Content="{DynamicResource XrayWithTLSDesc}"
                           VerticalContentAlignment="Center"
                           VerticalAlignment="Center" />
+            </Grid>
 
-            <Border Grid.Row="7"
-                    Grid.ColumnSpan="3"
+
+            <Border Grid.Row="1"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
+                            Margin="0,20,0,0"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
@@ -85,6 +86,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </Grid>
+        </StackPanel>
     </Grid>
 </views:MvxWindow>

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

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

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

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

ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml

@@ -22,7 +22,6 @@
                     BorderThickness="1,0,1,0" 
                     BorderBrush="#DDD" 
                     TabStripPlacement="Left"
-                    x:Name="TabCtrl"
                     SelectionChanged="BuildQrCode">
             <TabItem Width="200" Height="40"
                      Tag="{x:Static models:RayType.VLESS_TCP}"
@@ -45,13 +44,6 @@
                 <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}"                     
@@ -80,13 +72,6 @@
                 <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,5 +1,4 @@
 using Microsoft.Win32;
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -22,7 +21,9 @@ using System.Windows.Shapes;
 
 namespace ProxySuper.WPF.Views.V2ray
 {
-    [MvxWindowPresentation]
+    /// <summary>
+    /// V2rayConfigView.xaml 的交互逻辑
+    /// </summary>
     public partial class V2rayConfigView : MvxWindow
     {
         public V2rayConfigView()
@@ -30,22 +31,6 @@ namespace ProxySuper.WPF.Views.V2ray
             InitializeComponent();
         }
 
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-
-            for (int i = 0; i < TabCtrl.Items.Count; i++)
-            {
-                var tabItem = TabCtrl.Items[i] as TabItem;
-
-                if (Settings.Types.Contains((RayType)tabItem.Tag))
-                {
-                    TabCtrl.SelectedIndex = i;
-                    break;
-                }
-            }
-        }
-
         public V2raySettings Settings
         {
             get

ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml

@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="V2ray编辑配置" Height="640" Width="1015">
+        Title="V2ray编辑配置" Height="610" Width="1015">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -25,15 +25,16 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <Grid Grid.Column="2">
+        <StackPanel Grid.Column="2">
+            <Grid>
                 <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="50" />
+                    <RowDefinition Height="500" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ScrollViewer Name="scroll" 
                               Padding="10" 
-                            Height="auto"
+                              Height="500"
                               Grid.Row="0"
                               HorizontalScrollBarVisibility="Auto" 
                               VerticalScrollBarVisibility="Auto" >
@@ -59,5 +60,6 @@
                     </StackPanel>
                 </Border>
             </Grid>
+        </StackPanel>
     </Grid>
 </views:MvxWindow>

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

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

ProxySuper.WPF/Views/V2ray/V2rayInstallView.xaml

@@ -8,7 +8,7 @@
         xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="V2ray安装" Height="600" Width="1000">
+        Title="Trojan-Go安装" Height="600" Width="1000">
     <StackPanel>
         <ctrl:ProgressControl />
 

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

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

ProxySuper.WPF/Views/Xray/XrayConfigView.xaml

@@ -21,7 +21,6 @@
                     Padding="10"
                     BorderThickness="1,0,1,0" 
                     BorderBrush="#DDD" 
-                    x:Name="TabCtrl"
                     TabStripPlacement="Left"
                     SelectionChanged="BuildQrCode">
             <TabItem Width="200" Height="40"
@@ -52,13 +51,6 @@
                 <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}"                     
@@ -66,6 +58,13 @@
                 <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,13 +79,6 @@
                 <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,5 +1,4 @@
 using Microsoft.Win32;
-using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -8,12 +7,13 @@ using System.Drawing;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace ProxySuper.WPF.Views
 {
-    [MvxWindowPresentation]
+    /// <summary>
+    /// XrayInfoView.xaml 的交互逻辑
+    /// </summary>
     public partial class XrayConfigView : MvxWindow
     {
         public XrayConfigView()
@@ -21,22 +21,6 @@ namespace ProxySuper.WPF.Views
             InitializeComponent();
         }
 
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-
-            for (int i = 0; i < TabCtrl.Items.Count; i++)
-            {
-                var tabItem = TabCtrl.Items[i] as TabItem;
-
-                if (Settings.Types.Contains((RayType)tabItem.Tag))
-                {
-                    TabCtrl.SelectedIndex = i;
-                    break;
-                }
-            }
-        }
-
         public XraySettings Settings
         {
             get
@@ -45,6 +29,8 @@ namespace ProxySuper.WPF.Views
             }
         }
 
+
+
         private void BuildQrCode(object sender, SelectionChangedEventArgs e)
         {
             var tabControl = e.Source as TabControl;
@@ -88,9 +74,6 @@ 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;
@@ -105,9 +88,6 @@ 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;
@@ -121,16 +101,16 @@ namespace ProxySuper.WPF.Views
             }
 
 
-            var qrGenerator = new QRCodeGenerator();
-            var qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
-            var qrCode = new QRCode(qrCodeData);
+            QRCodeGenerator qrGenerator = new QRCodeGenerator();
+            QRCodeData qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
+            QRCode qrCode = new QRCode(qrCodeData);
 
-            var qrCodeImage = qrCode.GetGraphic(20);
-            var ms = new MemoryStream();
+            Bitmap qrCodeImage = qrCode.GetGraphic(20);
+            MemoryStream ms = new MemoryStream();
             qrCodeImage.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
             byte[] bytes = ms.GetBuffer();
             ms.Close();
-            var image = new BitmapImage();
+            BitmapImage 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="640" Width="1015">
+        Title="Xray编辑配置" Height="610" Width="1015">
 
     <Grid>
         <Grid.ColumnDefinitions>
@@ -26,15 +26,16 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <Grid Grid.Column="2">
+        <StackPanel Grid.Column="2">
+            <Grid>
                 <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="50" />
+                    <RowDefinition Height="500" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ScrollViewer Name="scroll" 
                               Padding="10" 
-                          Height="auto"
+                              Height="500"
                               Grid.Row="0"
                               HorizontalScrollBarVisibility="Auto" 
                               VerticalScrollBarVisibility="Auto" >
@@ -59,7 +60,7 @@
                                 Margin="20,0,40,0" />
                     </StackPanel>
                 </Border>
-
             </Grid>
+        </StackPanel>
     </Grid>
 </views:MvxWindow>