修复BBR启用时的BUG

proxysu · Jun 3, 2020 · a6ff33e · a6ff33e
1 parent bbc9219
commit a6ff33e
Show file tree

Hide file tree

Showing 4 changed files with 599 additions and 12 deletions.
diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
@@ -68,10 +68,10 @@
                     <TextBlock x:Name="TextBlockPassword" Text="密码：" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="1"></TextBlock>
                     <TextBox x:Name="TextBoxUserName" Text="root" Margin="5" Grid.Column="1" Grid.Row="1"></TextBox>
                     <PasswordBox x:Name="PasswordBoxHostPassword" Password=""   Margin="5" Grid.Column="3" Grid.Row="1"></PasswordBox>
-                    <RadioButton x:Name="RadioButtonPasswordLogin" GroupName="CertIsYesNo" Content="密码登录" Grid.Column="0" Grid.Row="2" Checked="RadioButtonPasswordLogin_Checked"></RadioButton>
-                    <RadioButton x:Name="RadioButtonCertLogin" GroupName="CertIsYesNo" Content="密钥登录" Grid.Column="1" Grid.Row="2" Checked="RadioButtonCertLogin_Checked"></RadioButton>
-                    <Button x:Name="ButtonOpenFileDialog" Content="浏览..." Margin="8" Grid.Column="2" Grid.Row="2" Click="ButtonOpenFileDialog_Click"></Button>
-                    <TextBox x:Name="TextBoxCertFilePath" Text=""  Style="{StaticResource TitleText}" Tag="密钥文件存放路径(不可为空)"  Margin="10" Grid.Column="3" Grid.Row="2"></TextBox>
+                    <RadioButton x:Name="RadioButtonPasswordLogin" GroupName="CertIsYesNo" Content="密码登录" Visibility="Hidden" Grid.Column="0" Grid.Row="2" Checked="RadioButtonPasswordLogin_Checked"></RadioButton>
+                    <RadioButton x:Name="RadioButtonCertLogin" GroupName="CertIsYesNo" Content="密钥登录" Visibility="Hidden" Grid.Column="1" Grid.Row="2" Checked="RadioButtonCertLogin_Checked"></RadioButton>
+                    <Button x:Name="ButtonOpenFileDialog" Content="浏览..." Visibility="Hidden" Margin="8" Grid.Column="2" Grid.Row="2" Click="ButtonOpenFileDialog_Click"></Button>
+                    <TextBox x:Name="TextBoxCertFilePath" Text=""  Style="{StaticResource TitleText}" Tag="密钥文件存放路径(不可为空)" Visibility="Hidden" Margin="10" Grid.Column="3" Grid.Row="2"></TextBox>
                     <!--代理设置-->
                     <Grid Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4">
                         <Grid.ColumnDefinitions>
@@ -134,7 +134,7 @@
                                 <Button x:Name="Button_canel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
-                        <TabItem Header="Trojan" Width="100" Height="30">
+                        <TabItem Header="Trojan/Trojan-Go" Width="120" Height="30">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition></ColumnDefinition>
@@ -152,7 +152,9 @@
                                 <Button x:Name="ButtonUpdateTrojan" Content="检测/升级Trojan版本" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonUpdateTrojan_Click"></Button>
                                 <Button x:Name="ButtonTrojanTemplate" Content="Trojan参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>
                                 <!--<TextBlock Text="Trojan参数设置" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
-
+                                <Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>
+
+
                                 <Button x:Name="ButtonTrojanSetUp" Content="Trojan一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanSetUp_Click"/>
                                 <Button x:Name="ButtonTrojanCancel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
@@ -385,7 +387,7 @@
                             <RowDefinition></RowDefinition>
                             <RowDefinition></RowDefinition>
                         </Grid.RowDefinitions>
-                        <TextBlock Text="程序版本：1.6.3" Grid.Column="0" Grid.Row="0"></TextBlock>
+                        <TextBlock Text="程序版本：1.6.4" Grid.Column="0" Grid.Row="0"></TextBlock>
 
                     </Grid>