From cdd0d6b844fee7550133d3f9071906b28fb3176c Mon Sep 17 00:00:00 2001
From: ProxySU <proxysetuptools@gmail.com>
Date: Sat, 21 Mar 2020 14:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E5=AE=8C=E5=90=8E=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProxySU/MainWindow.xaml                 |  11 ++++-
 ProxySU/MainWindow.xaml.cs              |  12 +++++-
 ProxySU/ProxySU.csproj                  |   7 +++
 ProxySU/ResultClientInformation.xaml    |  55 ++++++++++++++++++++++++
 ProxySU/ResultClientInformation.xaml.cs |  26 +++++++++++
 ProxySU/bin/Release/ProxySU.exe         | Bin 69120 -> 71680 bytes
 6 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 ProxySU/ResultClientInformation.xaml
 create mode 100644 ProxySU/ResultClientInformation.xaml.cs

diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index a01fc97..3dc0738 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -101,7 +101,16 @@
                 </TabItem>
                 <TabItem Header="BBR设置" Width="150" Height="30">
                     <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>
                 </TabItem>
             </TabControl>
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index 3dc196e..c8b280b 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -511,11 +511,15 @@ namespace ProxySU
                     client.RunCommand("sed -i 's/##mkcpHeaderType##/" + ReceiveConfigurationParameters[5] + "/' " + upLoadPath);
                     DownloadConfig(connectionInfo, "config\\config.json", upLoadPath);
                     client.Disconnect();
-                    MessageBox.Show("客户端配置文件已保存在config文件夹中");
 
                     currentStatus = "安装成功";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     Thread.Sleep(1000);
+
+                    //MessageBox.Show("客户端配置文件已保存在config文件夹中");
+                    ResultClientInformation resultClientInformation = new ResultClientInformation();
+                    resultClientInformation.ShowDialog();
+                    
                     return;
                 }
             }
@@ -681,6 +685,7 @@ namespace ProxySU
 
         }
 
+        //打开模板设置窗口
         private void ButtonTemplateConfiguration_Click(object sender, RoutedEventArgs e)
         {
             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();
+        }
     }
     
 }
diff --git a/ProxySU/ProxySU.csproj b/ProxySU/ProxySU.csproj
index ed5da9b..7d54c01 100644
--- a/ProxySU/ProxySU.csproj
+++ b/ProxySU/ProxySU.csproj
@@ -74,6 +74,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ResultClientInformation.xaml.cs">
+      <DependentUpon>ResultClientInformation.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TemplateConfiguration.xaml.cs">
       <DependentUpon>TemplateConfiguration.xaml</DependentUpon>
     </Compile>
@@ -89,6 +92,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="ResultClientInformation.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TemplateConfiguration.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml
new file mode 100644
index 0000000..faacc36
--- /dev/null
+++ b/ProxySU/ResultClientInformation.xaml
@@ -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>
diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs
new file mode 100644
index 0000000..d603342
--- /dev/null
+++ b/ProxySU/ResultClientInformation.xaml.cs
@@ -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();
+        }
+    }
+}
diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe
index e9e9012e5ebf12b86a9b05425c14a27cc9515b35..51bc6385c9ded31e0132d7a866ca4d90fc6281e2 100644
GIT binary patch
delta 13161
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
HFzbH-6nQ$!

delta 11503
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