From 4c0d3a0cf435bc76284ccdc7b67c7d36a3a0c01c Mon Sep 17 00:00:00 2001
From: autumn <lhf939@gmail.com>
Date: Mon, 21 Nov 2022 23:39:25 +0800
Subject: [PATCH] update ui

---
 ProxySuper.Core/ProxySuper.Core.csproj        |   1 +
 .../Controls/V2raySettingsControl.xaml        | 594 +++++++++---------
 .../Controls/XraySettingsControl.xaml         |   5 +-
 .../Views/TrojanGo/TrojanGoEditorView.xaml    |  76 +--
 .../Views/V2ray/V2rayEditorView.xaml          |  66 +-
 .../Views/V2ray/V2rayEditorView.xaml.cs       |   4 +-
 .../Views/Xray/XrayConfigView.xaml.cs         |  14 +-
 ProxySuper.WPF/Views/Xray/XrayEditorView.xaml |   2 +-
 .../Views/Xray/XrayEditorView.xaml.cs         |   2 +-
 .../Views/Xray/XrayInstallView.xaml.cs        |   4 +-
 10 files changed, 382 insertions(+), 386 deletions(-)

diff --git a/ProxySuper.Core/ProxySuper.Core.csproj b/ProxySuper.Core/ProxySuper.Core.csproj
index 7ceeb44..091ab17 100644
--- a/ProxySuper.Core/ProxySuper.Core.csproj
+++ b/ProxySuper.Core/ProxySuper.Core.csproj
@@ -65,6 +65,7 @@
     <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>
diff --git a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
index 5c63f27..270237a 100644
--- a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
@@ -11,322 +11,314 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
-    <StackPanel Orientation="Horizontal">
-        <StackPanel Width="220">
-            <!--TCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_TCP}">
-                <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
+        <!--节点类型-->
+        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
+            <StackPanel Orientation="Horizontal">
+                <WrapPanel Orientation="Vertical">
+                    <!--TCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_TCP}">
+                        <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VLESS_WS}">
-                <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_WS}">
+                        <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
-                      IsChecked="{Binding Path=Checked_VLESS_KCP}">
-                <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--mKCP-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_KCP}">
+                        <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
 
-            <!--gRPC-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      Foreground="LimeGreen"
-                      IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
-            </CheckBox>
+                    <!--gRPC-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              Foreground="LimeGreen"
+                              IsChecked="{Binding Path=Checked_VLESS_gRPC}">
+                        <Label  Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
+                    </CheckBox>
+                </WrapPanel>
 
-            <!--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}" />-->
+                <WrapPanel Orientation="Vertical">
+                    <!--WebSocket-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_WS}">
+                        <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
+                    </CheckBox>
 
-            <!--WebSocket-->
-            <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"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VMESS_KCP}">
+                        <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
+                    </CheckBox>
+                </WrapPanel>
 
-            <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_VMESS_KCP}">
-                <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
-            </CheckBox>
+                <WrapPanel Orientation="Vertical">
+                    <!--ss-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=CheckedShadowSocks}">
+                        <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
+                    </CheckBox>
 
-            <!--ss-->
-            <CheckBox Margin="0,15,0,0"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=CheckedShadowSocks}">
-                <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
-            </CheckBox>
-
-            <!--Trojan-->
-            <CheckBox Margin="0,15,0,0"
-                      Foreground="CadetBlue"
-                      VerticalContentAlignment="Center"
-                      IsChecked="{Binding Path=Checked_Trojan_TCP}">
-                <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
-            </CheckBox>
-
-        </StackPanel>
+                    <!--Trojan-->
+                    <CheckBox Width="150"
+                              Foreground="CadetBlue"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_Trojan_TCP}">
+                        <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
+                    </CheckBox>
+                </WrapPanel>
+            </StackPanel>
+        </GroupBox>
 
         <!--************************** 参数 **************************-->
 
-        <StackPanel>
-
-            <!--Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=Domain}" Width="200"  />
-            </StackPanel>
-
-            <!--Mask Domain-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
-                <CheckBox IsChecked="{Binding Path=WithTLS}" 
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </StackPanel>
-
-            <!--UUID-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayUUID}" Width="120" />
-
-                <TextBox Text="{Binding Path=UUID}"
-                            Width="200" />
-
-                <Button Margin="5,0,0,0"
-                        Padding="12,3"
-                        Command="{Binding Path=RandomUuid}"
-                        Content="{DynamicResource Random}" />
-            </StackPanel>
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_WS_Path}"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" Orientation="Horizontal">
-
-                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
-                <ComboBox Width="200" 
-                        ItemsSource="{Binding Path=KcpTypes}"
-                        SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                Visibility="{
-                    Binding Path=Checked_VLESS_KCP,
-                    Converter={StaticResource VisibleConverter}
-                }" 
-                Orientation="Horizontal">
-                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
-            </StackPanel>
-
-            <!--gRPC Port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VLESS_gRPC,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
-            </StackPanel>
-
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_VLESS_gRPC,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
-                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
-            </StackPanel>
-
-            <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>-->
-
-            <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_WS,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_WS_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>
-
-            <!--seed-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
-            </StackPanel>
-
-            <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal"
-                        Visibility="{
-                            Binding Path=Checked_VMESS_KCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
-                <ComboBox Width="200" 
-                          VerticalAlignment="Bottom"
-                          ItemsSource="{Binding Path=KcpTypes}"
-                          SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_KCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
-                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
-            </StackPanel>
-
-            <!--ss密码-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPassword}"
-                        Width="200"/>
-            </StackPanel>
-
-            <!--ss加密方式-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
-                <ComboBox Width="200"
-                        ItemsSource="{Binding ShadowSocksMethods}"
-                        SelectedValue="{Binding ShadowSocksMethod}">
-                </ComboBox>
-            </StackPanel>
-
-            <!--ss端口-->
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal" 
-                    Visibility="{
-                        Binding Path=CheckedShadowSocks,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
-            </StackPanel>
-
-            <!--Trojan密码-->
-            <StackPanel Margin="30,15,0,0" 
-                        Orientation="Horizontal" 
-                        Visibility="{
-                            Binding Path=Checked_Trojan_TCP,
-                            Converter={StaticResource VisibleConverter}
-                        }">
-                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
-                <TextBox Text="{Binding Path=TrojanPassword}" 
-                                Width="200" />
-            </StackPanel>
-
-            <!--xray prot-->
-            <StackPanel Margin="30,15,0,0"
-                    Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
-                <TextBox Text="{Binding Path=Port}" Width="120"  />
-                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
-            </StackPanel>
-
-            <!--多用户-->
-            <StackPanel Margin="30,10,0,0"
-                        Orientation="Vertical">
+        <!--参数设置-->
+        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
+            <StackPanel>
+                <!--Domain-->
                 <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+                    <Label Content="{DynamicResource XrayDomain}" Width="120"  />
+                    <TextBox Text="{Binding Path=Domain}" Width="200"  />
+                </StackPanel>
 
-                    <TextBox Text="{Binding Path=MultiUUID}"
-                             Height="60"
-                             TextWrapping="Wrap"
-                             Width="200" />
+                <!--Mask Domain-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                    <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
                 </StackPanel>
-                <StackPanel>
-                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+
+                <!--UUID-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayUUID}" Width="120" />
+
+                    <TextBox Text="{Binding Path=UUID}" Width="200" />
+
+                    <Button Margin="5,0,0,0"
+                            Padding="12,3"
+                            Command="{Binding Path=RandomUuid}"
+                            Content="{DynamicResource Random}" />
                 </StackPanel>
+
+                <!--more params-->
+                <Expander ExpandDirection="Down" Margin="0,10,0,0">
+                    <Expander.Header>
+                        <TextBlock Text="更多参数" FontWeight="Bold" />
+                    </Expander.Header>
+
+                    <Expander.Content>
+                        <StackPanel>
+                            <!--证书-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
+                                <CheckBox IsChecked="{Binding Path=WithTLS}" 
+                              Content="{DynamicResource XrayWithTLSDesc}"
+                              VerticalContentAlignment="Center"
+                              VerticalAlignment="Center" />
+                            </StackPanel>
+
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_WS,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="200" />
+                            </StackPanel>
+
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }"
+                                Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
+                                <ComboBox Width="200" 
+                                  ItemsSource="{Binding Path=KcpTypes}"
+                                  SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }" 
+                                Orientation="Horizontal">
+                                <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
+                            </StackPanel>
+
+                            <!--gRPC Port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VLESS_gRPC,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
+                            </StackPanel>
+
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
+                            </StackPanel>
+
+                            <!--WebSocket Path-->
+                            <StackPanel Margin="0,15,0,0" 
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
+                                <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_WS_Path}"
+                                 VerticalAlignment="Bottom"
+                                 Width="200" />
+                            </StackPanel>
+
+                            <!--seed-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
+                            </StackPanel>
+
+                            <!--kcp type-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
+                                <ComboBox Width="200" 
+                                  VerticalAlignment="Bottom"
+                                  ItemsSource="{Binding Path=KcpTypes}"
+                                  SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--kcp port-->
+                            <StackPanel Margin="0,15,0,0"
+                                Orientation="Horizontal"
+                                Visibility="{
+                                    Binding Path=Checked_VMESS_KCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
+                            </StackPanel>
+
+                            <!--ss密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="200"/>
+                            </StackPanel>
+
+                            <!--ss加密方式-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
+                                <ComboBox Width="200"
+                                  ItemsSource="{Binding ShadowSocksMethods}"
+                                  SelectedValue="{Binding ShadowSocksMethod}">
+                                </ComboBox>
+                            </StackPanel>
+
+                            <!--ss端口-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=CheckedShadowSocks,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
+                                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
+                            </StackPanel>
+
+                            <!--Trojan密码-->
+                            <StackPanel Margin="0,15,0,0" 
+                                Orientation="Horizontal" 
+                                Visibility="{
+                                    Binding Path=Checked_Trojan_TCP,
+                                    Converter={StaticResource VisibleConverter}
+                                }">
+                                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
+                                <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
+                            </StackPanel>
+
+                            <!--xray prot-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
+                                <TextBox Text="{Binding Path=Port}" Width="120"  />
+                                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
+                            </StackPanel>
+
+                            <!--多用户-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <Label Content="{DynamicResource MultiUser}" Width="120" />
+
+                                    <TextBox Text="{Binding Path=MultiUUID}"
+                                     Height="60"
+                                     TextWrapping="Wrap"
+                                     Width="200" />
+                                </StackPanel>
+                                <StackPanel>
+                                    <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </Expander.Content>
+                </Expander>
             </StackPanel>
-        </StackPanel>
+        </GroupBox>
     </StackPanel>
 
 </UserControl>
diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
index 99890f2..c7fb4a5 100644
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -94,14 +94,13 @@
         <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
             <StackPanel>
                 <!--Domain-->
-                <StackPanel Margin="0,15,0,0"
-                    Orientation="Horizontal">
+                <StackPanel Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayDomain}" Width="120" />
                     <TextBox Text="{Binding Path=Domain}" Width="260"  />
                 </StackPanel>
 
                 <!--UUID-->
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayUUID}" Width="120" />
 
                     <TextBox Text="{Binding Path=UUID}"
diff --git a/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml b/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
index 467538d..35b8366 100644
--- a/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
+++ b/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
@@ -23,54 +23,54 @@
             <ctrl:HostControl />
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
+ 
+        <Grid Margin="10,10,0,0" Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-        <StackPanel Grid.Column="2">
-            <Grid Margin="10">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
+            <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoPort}" Grid.Row="1" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoPort}" Grid.Row="1" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoPassword}" Grid.Row="2" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoPassword}" Grid.Row="2" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoMaskDomain}" Grid.Row="3" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="3" Grid.Column="1" />
 
-                <Label Content="{DynamicResource TrojanGoMaskDomain}" Grid.Row="3" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="3" Grid.Column="1" />
-
-                <Label Content="{DynamicResource TrojanGoWebSocketPath}" Grid.Row="4" Grid.Column="0" />
-                <TextBox Text="{Binding Settings.WebSocketPath}" Grid.Row="4" Grid.Column="1" />
+            <Label Content="{DynamicResource TrojanGoWebSocketPath}" Grid.Row="4" Grid.Column="0" />
+            <TextBox Text="{Binding Settings.WebSocketPath}" Grid.Row="4" Grid.Column="1" />
 
 
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" Grid.Row="5" Grid.Column="0" />
-                <CheckBox IsChecked="{Binding Path=Settings.WithTLS}" 
-                          Grid.Row="5"
-                          Grid.Column="1"
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </Grid>
+            <Label Content="{DynamicResource XrayWithTLS}" Width="120" Grid.Row="5" Grid.Column="0" />
+            <CheckBox IsChecked="{Binding Path=Settings.WithTLS}" 
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Content="{DynamicResource XrayWithTLSDesc}"
+                        VerticalContentAlignment="Center"
+                        VerticalAlignment="Center" />
 
-
-            <Border Grid.Row="1"
+            <Border Grid.Row="7"
+                    Grid.ColumnSpan="3"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            Margin="0,20,0,0"
+                            Height="50"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
@@ -86,6 +86,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>
diff --git a/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml b/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml
index 5d2a0f3..4dcd993 100644
--- a/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml
+++ b/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml
@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="V2ray编辑配置" Height="610" Width="1015">
+        Title="V2ray编辑配置" Height="640" Width="1015">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -25,41 +25,39 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="500" />
-                    <RowDefinition Height="80" />
-                </Grid.RowDefinitions>
+        <Grid Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
 
-                <ScrollViewer Name="scroll" 
-                              Padding="10" 
-                              Height="500"
-                              Grid.Row="0"
-                              HorizontalScrollBarVisibility="Auto" 
-                              VerticalScrollBarVisibility="Auto" >
-                    <ctrl:V2raySettingsControl />
-                </ScrollViewer>
+            <ScrollViewer Name="scroll" 
+                            Padding="10" 
+                            Height="auto"
+                            Grid.Row="0"
+                            HorizontalScrollBarVisibility="Auto" 
+                            VerticalScrollBarVisibility="Auto" >
+                <ctrl:V2raySettingsControl />
+            </ScrollViewer>
 
-                <Border Grid.Row="1"
-                        BorderBrush="#eee"
-                        BorderThickness="0,1,0,0">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button Content="{DynamicResource Save}" 
-                                Command="{Binding SaveCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5" />
+            <Border Grid.Row="1"
+                    BorderBrush="#eee"
+                    BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="50">
+                    <Button Content="{DynamicResource Save}" 
+                            Command="{Binding SaveCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5" />
 
-                        <Button Content="{DynamicResource SaveAndInstall}"
-                                Command="{Binding SaveAndInstallCommand}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Padding="10,5"
-                                Margin="20,0,40,0" />
-                    </StackPanel>
-                </Border>
-            </Grid>
-        </StackPanel>
+                    <Button Content="{DynamicResource SaveAndInstall}"
+                            Command="{Binding SaveAndInstallCommand}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Padding="10,5"
+                            Margin="20,0,40,0" />
+                </StackPanel>
+            </Border>
+        </Grid> 
     </Grid>
 </views:MvxWindow>
diff --git a/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs b/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs
index fefde04..a437829 100644
--- a/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs
+++ b/ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs
@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,6 +19,7 @@ namespace ProxySuper.WPF.Views.V2ray
     /// <summary>
     /// V2rayEditorView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation]
     public partial class V2rayEditorView : MvxWindow
     {
         public V2rayEditorView()
diff --git a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
index 0386632..f734678 100644
--- a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
+++ b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -15,6 +16,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayInfoView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation()]
     public partial class XrayConfigView : MvxWindow
     {
         public XrayConfigView()
@@ -116,16 +118,16 @@ namespace ProxySuper.WPF.Views
             }
 
 
-            QRCodeGenerator qrGenerator = new QRCodeGenerator();
-            QRCodeData qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
-            QRCode qrCode = new QRCode(qrCodeData);
+            var qrGenerator = new QRCodeGenerator();
+            var qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
+            var qrCode = new QRCode(qrCodeData);
 
-            Bitmap qrCodeImage = qrCode.GetGraphic(20);
-            MemoryStream ms = new MemoryStream();
+            var qrCodeImage = qrCode.GetGraphic(20);
+            var ms = new MemoryStream();
             qrCodeImage.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
             byte[] bytes = ms.GetBuffer();
             ms.Close();
-            BitmapImage image = new BitmapImage();
+            var image = new BitmapImage();
             image.BeginInit();
             image.StreamSource = new MemoryStream(bytes);
             image.EndInit();
diff --git a/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml b/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml
index a548ca9..5c4d594 100644
--- a/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml
+++ b/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml
@@ -34,8 +34,8 @@
 
             <ScrollViewer Name="scroll" 
                           Padding="10"  
-                          Grid.Row="0"
                           Height="auto"
+                          Grid.Row="0"
                           HorizontalScrollBarVisibility="Auto" 
                           VerticalScrollBarVisibility="Auto" >
                 <ctrl:XraySettingsControl />
diff --git a/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs b/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs
index 6c0e57e..d36a828 100644
--- a/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs
+++ b/ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs
@@ -7,7 +7,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayEditorView.xaml 的交互逻辑
     /// </summary>
-    [MvxWindowPresentation(Identifier = nameof(XrayEditorView), Modal = false)]
+    [MvxWindowPresentation()]
     public partial class XrayEditorView : MvxWindow
     {
         public XrayEditorView()
diff --git a/ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs b/ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs
index b24bfec..2c426ce 100644
--- a/ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs
+++ b/ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs
@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using MvvmCross.ViewModels;
 using ProxySuper.Core.ViewModels;
 using System;
@@ -20,6 +21,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayInstallView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation()]
     public partial class XrayInstallView : MvxWindow
     {
         public XrayInstallView()