mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-04-16 15:41:00 +00:00
添加显示安装完后服务端设置窗口
This commit is contained in:
ProxySU
parent
3bad4679fb
commit
cdd0d6b844
6 changed files with 109 additions and 2 deletions
|
|
@ -101,7 +101,16 @@
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="BBR设置" Width="150" Height="30">
|
<TabItem Header="BBR设置" Width="150" Height="30">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Button Content="测试接收到的模参数" Margin="50" Click="Button_Click"></Button>
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition></ColumnDefinition>
|
||||||
|
<ColumnDefinition></ColumnDefinition>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Button Content="测试接收到的模参数" Grid.Column="0" Grid.Row="0" Margin="10" Click="Button_Click"></Button>
|
||||||
|
<Button Content="测试结果窗口" Grid.Column="0" Grid.Row="1" Margin="10" Click="Button_Click_1"></Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|
|
||||||
|
|
@ -511,11 +511,15 @@ namespace ProxySU
|
||||||
client.RunCommand("sed -i 's/##mkcpHeaderType##/" + ReceiveConfigurationParameters[5] + "/' " + upLoadPath);
|
client.RunCommand("sed -i 's/##mkcpHeaderType##/" + ReceiveConfigurationParameters[5] + "/' " + upLoadPath);
|
||||||
DownloadConfig(connectionInfo, "config\\config.json", upLoadPath);
|
DownloadConfig(connectionInfo, "config\\config.json", upLoadPath);
|
||||||
client.Disconnect();
|
client.Disconnect();
|
||||||
MessageBox.Show("客户端配置文件已保存在config文件夹中");
|
|
||||||
|
|
||||||
currentStatus = "安装成功";
|
currentStatus = "安装成功";
|
||||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1000);
|
||||||
|
|
||||||
|
//MessageBox.Show("客户端配置文件已保存在config文件夹中");
|
||||||
|
ResultClientInformation resultClientInformation = new ResultClientInformation();
|
||||||
|
resultClientInformation.ShowDialog();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -681,6 +685,7 @@ namespace ProxySU
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//打开模板设置窗口
|
||||||
private void ButtonTemplateConfiguration_Click(object sender, RoutedEventArgs e)
|
private void ButtonTemplateConfiguration_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
WindowTemplateConfiguration windowTemplateConfiguration = new WindowTemplateConfiguration();
|
WindowTemplateConfiguration windowTemplateConfiguration = new WindowTemplateConfiguration();
|
||||||
|
|
@ -698,6 +703,11 @@ namespace ProxySU
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Button_Click_1(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
ResultClientInformation resultClientInformation = new ResultClientInformation();
|
||||||
|
resultClientInformation.ShowDialog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,9 @@
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</ApplicationDefinition>
|
</ApplicationDefinition>
|
||||||
|
<Compile Include="ResultClientInformation.xaml.cs">
|
||||||
|
<DependentUpon>ResultClientInformation.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="TemplateConfiguration.xaml.cs">
|
<Compile Include="TemplateConfiguration.xaml.cs">
|
||||||
<DependentUpon>TemplateConfiguration.xaml</DependentUpon>
|
<DependentUpon>TemplateConfiguration.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
@ -89,6 +92,10 @@
|
||||||
<DependentUpon>MainWindow.xaml</DependentUpon>
|
<DependentUpon>MainWindow.xaml</DependentUpon>
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Page Include="ResultClientInformation.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
<Page Include="TemplateConfiguration.xaml">
|
<Page Include="TemplateConfiguration.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
|
|
||||||
55
ProxySU/ResultClientInformation.xaml
Normal file
55
ProxySU/ResultClientInformation.xaml
Normal file
|
|
@ -0,0 +1,55 @@
|
||||||
|
<Window x:Class="ProxySU.ResultClientInformation"
|
||||||
|
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:ProxySU"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
Title="ResultClientInformation" Height="400" Width="600">
|
||||||
|
<Grid>
|
||||||
|
<GroupBox Header="服务器连接配置">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition></ColumnDefinition>
|
||||||
|
<ColumnDefinition></ColumnDefinition>
|
||||||
|
<ColumnDefinition></ColumnDefinition>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
<RowDefinition></RowDefinition>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock Text="地址(address)" Grid.Column="0" Grid.Row="0" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxHostAddress" Grid.Column="1" Grid.Row="0" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="0"></TextBlock>
|
||||||
|
<TextBlock Text="端口(port)" Grid.Column="0" Grid.Row="1" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxPort" Grid.Column="1" Grid.Row="1" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="1"></TextBlock>
|
||||||
|
<TextBlock Text="用户ID(uuid)" Grid.Column="0" Grid.Row="2" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxUUID" Grid.Column="1" Grid.Row="2" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="2"></TextBlock>
|
||||||
|
<TextBlock Text="加密方式" Grid.Column="0" Grid.Row="3" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxEncryption" Grid.Column="1" Grid.Row="3" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="3"></TextBlock>
|
||||||
|
<TextBlock Text="传输协议" Grid.Column="0" Grid.Row="4" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxTransmission" Grid.Column="1" Grid.Row="4" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="4"></TextBlock>
|
||||||
|
<TextBlock Text="伪装类型" Grid.Column="0" Grid.Row="5" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxCamouflageType" Grid.Column="1" Grid.Row="5" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="5"></TextBlock>
|
||||||
|
<TextBlock Text="路径(Path)" Grid.Column="0" Grid.Row="6" Margin="8"></TextBlock>
|
||||||
|
<TextBox x:Name="TextBoxPath" Grid.Column="1" Grid.Row="6" Margin="8"></TextBox>
|
||||||
|
<TextBlock Text="说明" Grid.Column="2" Grid.Row="6"></TextBlock>
|
||||||
|
|
||||||
|
<Button Content="确定" Grid.Column="1" Grid.Row="7" Grid.RowSpan="2" Margin="8"></Button>
|
||||||
|
<Button Content="取消" Grid.Column="2" Grid.Row="7" Grid.RowSpan="2" Margin="8"></Button>
|
||||||
|
</Grid>
|
||||||
|
</GroupBox>
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
26
ProxySU/ResultClientInformation.xaml.cs
Normal file
26
ProxySU/ResultClientInformation.xaml.cs
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
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 ProxySU
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// ResultClientInformation.xaml 的交互逻辑
|
||||||
|
/// </summary>
|
||||||
|
public partial class ResultClientInformation : Window
|
||||||
|
{
|
||||||
|
public ResultClientInformation()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Loading…
Add table
Reference in a new issue