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 @@ - + + + + + + + + + + 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 @@ MSBuild:Compile Designer + + ResultClientInformation.xaml + TemplateConfiguration.xaml @@ -89,6 +92,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + Designer MSBuild:Compile 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 +{ + /// + /// ResultClientInformation.xaml 的交互逻辑 + /// + public partial class ResultClientInformation : Window + { + public ResultClientInformation() + { + InitializeComponent(); + } + } +} diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe index e9e9012..51bc638 100644 Binary files a/ProxySU/bin/Release/ProxySU.exe and b/ProxySU/bin/Release/ProxySU.exe differ